aboutsummaryrefslogtreecommitdiffstats
path: root/translations
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-01-25 08:33:22 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-01-25 08:33:22 -0800
commit8cd24f243261d182b058952f5b6ff7552eea5389 (patch)
treefba5d9d0cd58c8e58c2a2365a05d83e0fd34c075 /translations
parenta8376bf4371778d0904843f1dc3e16f14d91aba7 (diff)
downloadsubsurface-8cd24f243261d182b058952f5b6ff7552eea5389.tar.gz
Latest strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations')
-rw-r--r--translations/subsurface_bg_BG.ts407
-rw-r--r--translations/subsurface_da_DK.ts397
-rw-r--r--translations/subsurface_de_CH.ts315
-rw-r--r--translations/subsurface_de_DE.ts323
-rw-r--r--translations/subsurface_el_GR.ts280
-rw-r--r--translations/subsurface_en_GB.ts337
-rw-r--r--translations/subsurface_es_ES.ts407
-rw-r--r--translations/subsurface_et_EE.ts296
-rw-r--r--translations/subsurface_fi_FI.ts406
-rw-r--r--translations/subsurface_fr_FR.ts324
-rw-r--r--translations/subsurface_he.ts269
-rw-r--r--translations/subsurface_hr_HR.ts272
-rw-r--r--translations/subsurface_hu.ts253
-rw-r--r--translations/subsurface_id.ts259
-rw-r--r--translations/subsurface_it_IT.ts323
-rw-r--r--translations/subsurface_lv_LV.ts297
-rw-r--r--translations/subsurface_nb_NO.ts301
-rw-r--r--translations/subsurface_nl_NL.ts353
-rw-r--r--translations/subsurface_pl_PL.ts323
-rw-r--r--translations/subsurface_pt_BR.ts296
-rw-r--r--translations/subsurface_pt_PT.ts323
-rw-r--r--translations/subsurface_ro_RO.ts282
-rw-r--r--translations/subsurface_ru_RU.ts319
-rw-r--r--translations/subsurface_sk_SK.ts314
-rw-r--r--translations/subsurface_source.ts235
-rw-r--r--translations/subsurface_sv_SE.ts317
-rw-r--r--translations/subsurface_tr.ts287
-rw-r--r--translations/subsurface_vi.ts272
-rw-r--r--translations/subsurface_zh_TW.ts301
29 files changed, 4738 insertions, 4350 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index 34eb0627e..45773dbcd 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -26,147 +26,147 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Гмуркане №</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Дата</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Време</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Продълж. (мин.)</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Местонахождение</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Тежест</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Големина на бутилката</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Начално налягане</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Крайно налягане</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Макс. дълбочина</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Avg depth</source>
- <translation type="unfinished"/>
+ <translation>Средна дълбочина</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Водач</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Партньор</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Бележки</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Тагове</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Темп. на въздух</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Темп. на водата</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Време на проба</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Дълбочина на проба</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Температура на проба</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample stopdepth</source>
- <translation type="unfinished"/>
+ <translation>Дълбоч. стоп на проба</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Налягане на проба</translation>
</message>
</context>
<context>
@@ -1264,27 +1264,27 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
<source>Date/time</source>
- <translation type="unfinished"/>
+ <translation>Дата/време</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Продълж. (мин.)</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Дълбочина</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>ч:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>мин</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@
<translation>Експортирай HTML файлове като</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Не може да бъде отворен файл %s</translation>
</message>
@@ -1759,7 +1759,7 @@
<translation>Вмъкни гмуркачески регистър</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Време</translation>
</message>
@@ -1791,40 +1791,40 @@
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
<source>Drag the tags above to each corresponding column below</source>
- <translation type="unfinished"/>
+ <translation>Може да завлечете таговете към определена колона долу</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Гмуркане №</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Дата</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Продълж. (мин.)</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Тагове</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1844,142 +1844,165 @@
<translation>Минути:секунди</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Местонахождение</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Макс. дълбочина</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
- <translation type="unfinished"/>
+ <translation>Етикет</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
- <translation type="unfinished"/>
+ <translation>Някой заглавия на колони бяха популирани. Моля завлечете ги за да паснат на колоната към която са.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Време на проба</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Дълбочина на проба</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Температура на проба</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+ <source>Sample cns</source>
+ <translation>CNS на проба</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
- <source>Sample cns</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+ <source>Sample ndl</source>
+ <translation>NDL на проба</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+ <source>Sample tts</source>
+ <translation>TTS на проба</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+ <source>Sample stopdepth</source>
+ <translation>Дълбоч. стоп на проба</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
- <source>Sample ndl</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
- <source>Sample tts</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
- <source>Sample stopdepth</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
- <translation type="unfinished"/>
+ <translation>Налягане на проби</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Налягане на проба</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Средна дълбочина</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Водач</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Партньор</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Бележки</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Тежест</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Големина на бутилката</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Начално налягане</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Крайно налягане</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Темп. на въздух</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Темп. на водата</translation>
</message>
</context>
<context>
@@ -2136,22 +2159,22 @@
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
<source>Setpoint</source>
- <translation type="unfinished"/>
+ <translation>Сетпойнт</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
<source>Sensor1</source>
- <translation type="unfinished"/>
+ <translation>Сензор1</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
<source>Sensor2</source>
- <translation type="unfinished"/>
+ <translation>Сензор2</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
<source>Sensor3</source>
- <translation type="unfinished"/>
+ <translation>Сензор3</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
@@ -2161,17 +2184,17 @@
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
<source>Heart beat</source>
- <translation type="unfinished"/>
+ <translation>Сърдечен ритъм</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
<source>Gradient factor</source>
- <translation type="unfinished"/>
+ <translation>Градиент фактор</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
<source>Mean depth/s</source>
- <translation type="unfinished"/>
+ <translation>Средна дълбочина</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
@@ -2486,7 +2509,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Изтегли</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Изтегли</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2576,17 +2599,17 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
<source>Downloaded Dives</source>
- <translation type="unfinished"/>
+ <translation>Изтеглени гмуркания</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Селектирай всички</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Деселектирай всички</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,12 +2644,17 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Успешно качване на снимка</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
<source>Your dive profile was updated to Facebook.</source>
+ <translation>Гмуркаческия профил бе качен във Facebook</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2634,12 +2662,9 @@
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Грешка при качването на снимката</translation>
+ <translation>Вашия гмуркачески профил не бе обновен във Facebook,
+ Моля изпратете следното на авторите.
+</translation>
</message>
</context>
<context>
@@ -2772,7 +2797,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Режим на гмуркане</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3720,17 +3745,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>Open circuit</source>
- <translation type="unfinished"/>
+ <translation>Отворена верига</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>CCR</source>
- <translation type="unfinished"/>
+ <translation>CCR</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>pSCR</source>
- <translation type="unfinished"/>
+ <translation>pSCR</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="480"/>
@@ -3935,38 +3960,38 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="809"/>
<source>Default CCR set-point for dive planning</source>
- <translation type="unfinished"/>
+ <translation>Стандартен CCR сетпойнт за плануване на гмуркане</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="832"/>
<source>pSCR O₂ metabolism rate</source>
- <translation type="unfinished"/>
+ <translation>pSCR O₂ честота от метаболизъм</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="839"/>
<source>pSCR ratio</source>
- <translation type="unfinished"/>
+ <translation>pSCR съотношение</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>л/мин.</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
<source>1:</source>
- <translation type="unfinished"/>
+ <translation>1:</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="875"/>
@@ -4011,7 +4036,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="1079"/>
<source>Disconnect from Facebook</source>
- <translation type="unfinished"/>
+ <translation>Прекъсване на връзката с Facebook</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="895"/>
@@ -4421,7 +4446,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
<source>Unknown dive computer</source>
- <translation type="unfinished"/>
+ <translation>Непознат гмуркачески компютър</translation>
</message>
<message>
<location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
@@ -4802,7 +4827,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<location filename="../qt-ui/socialnetworks.cpp" line="282"/>
<source>Dive date: %1
</source>
- <translation type="unfinished"/>
+ <translation>Дата на гмуркане: %1
+</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4827,7 +4853,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<location filename="../qt-ui/socialnetworks.cpp" line="290"/>
<source>Dive location: %1
</source>
- <translation type="unfinished"/>
+ <translation>Местонахождение: %1
+</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4937,7 +4964,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>&amp;Затвори</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;мулти-платформен, гмуркачески регистър софтуер&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Линус Торвалдс, Дърк Хондел, Томаз Канабрава, и други, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5068,42 +5095,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Провери за обновления</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface не успя да провери за обновления.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Грешка:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Моля проверете интернет връзката си.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Вие използватe последната версия на Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Има нова версия на Subsruface.&lt;br/&gt;Щракнете на:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; за да я изтеглите.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Има нова версия на Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Последната версия е %1. Моля проверете вашия OS доставчик за обновления.</translation>
</message>
@@ -5142,8 +5169,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Ръководство за потребителя</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5227,16 +5254,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Операционна система: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-CPU архитектура: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5276,13 +5307,6 @@ Language: %1</source>
<translation>Изпрати</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS CPU архитектура %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface не успя да изпрати потребителското изследване.</translation>
@@ -5573,7 +5597,7 @@ Maximum</source>
<translation>(%s) или (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5798,12 +5822,6 @@ Maximum</source>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>време за въздух</translation>
@@ -5819,6 +5837,8 @@ Maximum</source>
<translation>посока</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6214,7 +6234,7 @@ Maximum</source>
<message>
<location filename="../planner.c" line="769"/>
<source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
- <translation type="unfinished"/>
+ <translation>ниска pO₂ стойност %.2f към %d:%02u с газ %s при дълбочина %.*f %s</translation>
</message>
<message>
<location filename="../planner.c" line="1085"/>
@@ -6737,31 +6757,6 @@ EADD: %d%s
<translation>Дек</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: файловата система е почти пълна
-Излючете и свържете на ново леководолазния компютър
-и опитайте пак</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Файловата система е пълна
-Излючете/Свържете на ново леководолазния компютър
-и опитайте пак</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Кратък запис в req.txt файл
-Uemis Zurich включен ли е правилно?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>неизвестно</translation>
@@ -6777,6 +6772,26 @@ Uemis Zurich включен ли е правилно?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>divelog #</translation>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index 2cade31fa..b3819fac6 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -26,147 +26,147 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Dyk #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Dato</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Tid</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Varighed</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Placering</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Vægt</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Tank str</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Start tryk</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Slut tryk</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Max dybde</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Avg depth</source>
- <translation type="unfinished"/>
+ <translation>Gnm dybde</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Makker</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Noter</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Tags</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Luft temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Vand temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Eksempel tid</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Eksempel dybde</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Eksempel temperatur</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample stopdepth</source>
- <translation type="unfinished"/>
+ <translation>Eksempel stopdybde</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Eksempel tryk</translation>
</message>
</context>
<context>
@@ -1264,27 +1264,27 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
<source>Date/time</source>
- <translation type="unfinished"/>
+ <translation>Dato/tid</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Varighed</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Dybde</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min.</translation>
</message>
</context>
<context>
@@ -1540,12 +1540,12 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="140"/>
<source>CSV dive profile</source>
- <translation type="unfinished"/>
+ <translation>CSV dyk profil</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="150"/>
<source>CSV dive details</source>
- <translation type="unfinished"/>
+ <translation>CSV dyk detaljer</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="170"/>
@@ -1555,7 +1555,7 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="248"/>
<source>CSV units</source>
- <translation type="unfinished"/>
+ <translation>CSV enheder</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="261"/>
@@ -1671,12 +1671,12 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
<source>Comma separated values describing the dive profile.</source>
- <translation type="unfinished"/>
+ <translation>Komma separerede værdier som beskriver profiler.</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
<source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
- <translation type="unfinished"/>
+ <translation>Komma separerede værdier over dyk informationen. Disse indeholder de fleste dyk detaljer men ingen profil information.</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
@@ -1746,7 +1746,7 @@ fjerne den valgte dykkercomputer?</translation>
<translation>Exporter HTML filer som</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Kan ikke åbne filen %s</translation>
</message>
@@ -1759,7 +1759,7 @@ fjerne den valgte dykkercomputer?</translation>
<translation>Importer dykkerlog</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Tid</translation>
</message>
@@ -1794,37 +1794,37 @@ fjerne den valgte dykkercomputer?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Dyk #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Dato</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Varighed</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Tags</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1841,145 +1841,168 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
<source>Minutes:seconds</source>
- <translation type="unfinished"/>
+ <translation>Minutter:sekunder</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Lokation</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Max dybde</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Eksempel tid</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Eksempel dybde</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Eksempel temperatur</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+ <source>Sample cns</source>
+ <translation>Eksempel CNS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
- <source>Sample cns</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+ <source>Sample ndl</source>
+ <translation>Eksempel NDL</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+ <source>Sample tts</source>
+ <translation>Eksempel tts</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+ <source>Sample stopdepth</source>
+ <translation>Eksempel stopdybde</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
- <source>Sample ndl</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
- <source>Sample tts</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
- <source>Sample stopdepth</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
- <translation type="unfinished"/>
+ <translation>Eksempel tryk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Eksempel tryk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Gnm dybde</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Makker</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Noter</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Vægt</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Tank str.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Start tryk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Slut tryk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Luft temp.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Vand temp.</translation>
</message>
</context>
<context>
@@ -2136,22 +2159,22 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
<source>Setpoint</source>
- <translation type="unfinished"/>
+ <translation>Setpoint</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
<source>Sensor1</source>
- <translation type="unfinished"/>
+ <translation>Sensor1</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
<source>Sensor2</source>
- <translation type="unfinished"/>
+ <translation>Sensor2</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
<source>Sensor3</source>
- <translation type="unfinished"/>
+ <translation>Sensor3</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
@@ -2161,17 +2184,17 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
<source>Heart beat</source>
- <translation type="unfinished"/>
+ <translation>Hjerteslag</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
<source>Gradient factor</source>
- <translation type="unfinished"/>
+ <translation>Gradient factor</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
<source>Mean depth/s</source>
- <translation type="unfinished"/>
+ <translation>Middel dybde(r)</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
@@ -2486,7 +2509,7 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Download</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Download</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2576,17 +2599,17 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
<source>Downloaded Dives</source>
- <translation type="unfinished"/>
+ <translation>Downloadede dyk</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Vælg alt</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Fra vælg alt</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,7 +2644,7 @@ fjerne den valgte dykkercomputer?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2630,17 +2653,17 @@ fjerne den valgte dykkercomputer?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2772,7 +2795,7 @@ fjerne den valgte dykkercomputer?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Dykker tilstand</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3409,7 +3432,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/mainwindow.ui" line="813"/>
<source>User &amp;survey</source>
- <translation type="unfinished"/>
+ <translation>Bruger &amp;undersøgelse</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="796"/>
@@ -3657,7 +3680,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/mainwindow.cpp" line="1315"/>
<source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
- <translation type="unfinished"/>
+ <translation>Dyk logfiler (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;Alle filer (*)</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.cpp" line="1355"/>
@@ -3678,7 +3701,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
<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"/>
+ <translation>Du bør opdatere firmwaren i din dykkercomputer: Du har version %1 hvor den nyeste er version %2</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
@@ -3700,12 +3723,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
<source>Firmware upgrade notice</source>
- <translation type="unfinished"/>
+ <translation>Firmware opdaterings note</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
<source>Save the downloaded firmware as</source>
- <translation type="unfinished"/>
+ <translation>Gem den downloadede firmware som</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
@@ -3718,17 +3741,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>Open circuit</source>
- <translation type="unfinished"/>
+ <translation>Open circuit</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>CCR</source>
- <translation type="unfinished"/>
+ <translation>CCR</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>pSCR</source>
- <translation type="unfinished"/>
+ <translation>pSCR</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="480"/>
@@ -3933,12 +3956,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3959,7 +3982,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4933,7 +4956,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>&amp;Luk</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5064,42 +5087,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Tjek for opdateringer</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface kunne ikke tjekke for opdateringer</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Følgende fejl opstod:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Tjek din internet forbindelse.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Du anvender den nyeste version af Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>En ny version af Subsurface er tilgængelig.&lt;br/&gt;Klik på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; for at downloade den.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>En ny version af Subsurface er tilgængelig.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Nyeste version er %s, tjek venligst med din OS leverandør for opdateringer.</translation>
</message>
@@ -5138,8 +5161,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Brugermanual</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5223,16 +5246,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Operativ System: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-CPU Arkitektur: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5272,13 +5299,6 @@ Sprog: %1</translation>
<translation>Send</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS CPU Arkitektur: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface kunne ikke sende bruger undersøgelsen.</translation>
@@ -5569,7 +5589,7 @@ Gennemsnit</translation>
<translation>(%s) eller (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5794,12 +5814,6 @@ Gennemsnit</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>Lufttid</translation>
@@ -5815,6 +5829,8 @@ Gennemsnit</translation>
<translation>Overskrift</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6718,31 +6734,6 @@ EADD: %d%s
<translation>Dec</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Filsystemet er næsten fuldt
-Afmonter / monter dykkercomputeren
-og klik &apos;Prøv igen&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Filsystemet er næsten fuldt
-Afmonter / monter dykkercomputeren
-og klik &apos;Prøv igen&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Skrivefejl til reg.txt fil
-Er Uemis Zurich tilsluttet korrekt?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>Ukendt</translation>
@@ -6758,6 +6749,26 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>dykkerlog #</translation>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index b0e42b91e..4344434d4 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Tauchgang Nr.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Datum</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Zeit</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Dauer</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Ort</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Gewicht</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Anfangsdruck</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Enddruck</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Max. Tiefe</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,32 +86,32 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Buddy</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notizen</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Stichwörter</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Wassertemp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1268,12 +1268,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Dauer</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Tiefe</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1283,7 +1283,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1745,7 +1745,7 @@
<translation>HTML-Datei exportieren als</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Kann Datei %s nicht öffnen</translation>
</message>
@@ -1758,7 +1758,7 @@
<translation>Tauchprotokolldatei importieren</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
@@ -1793,37 +1793,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Tauchgang Nr.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Dauer</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Stichwörter</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1843,142 +1843,165 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Ort</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Max. Tiefe</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Mittlere Tiefe</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notizen</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Gewicht</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Anfangsdruck</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Enddruck</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Wassertemp.</translation>
</message>
</context>
<context>
@@ -2485,7 +2508,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Herunterladen</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2560,7 +2583,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Herunterladen</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2580,12 +2603,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Alle auswählen</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Alle abwählen</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2620,7 +2643,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2629,17 +2652,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2771,7 +2794,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Tauchmodus</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3932,12 +3955,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3958,7 +3981,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4930,7 +4953,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Schliessen</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5061,42 +5084,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Neue Version suchen</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Fehlermeldung erhalten:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Dies ist die neuste Subsurfaceversion.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Es gibt eine neue Subsurface-Version.&lt;br/&gt;Klick hier:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; zum Download.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Es gibt eine neue Version von Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Die aktuellste Version ist %1, bitte den Betriebssystem Hersteller kontaktieren.</translation>
</message>
@@ -5135,8 +5158,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Benutzerhandbuch</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5220,16 +5243,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Betriebssystem: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Prozessor Architektur: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5269,13 +5296,6 @@ Sprache: %1</translation>
<translation>Senden</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-Prozessor Architektur (laut Betriebsystem): %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface konnte die Benutzerumfrage nicht übertragen.</translation>
@@ -5566,7 +5586,7 @@ Durchschnitt</translation>
<translation>(%s) oder (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5791,12 +5811,6 @@ Durchschnitt</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO₂</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>verbleibende Atemzeit</translation>
@@ -5812,6 +5826,8 @@ Durchschnitt</translation>
<translation>Richtung</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6716,31 +6732,6 @@ EADD: %d%s
<translation>Dez</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zürich: Dateisystem beinahe voll
-Bitte den Tauchcomputer ausstecken, wieder einstecken
-und erneut versuchen</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zürich: Dateisystem ist voll.
-Bitte den Tauchcomputer ausstecken, wieder einstecken
-und erneut versuchen</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Unvollständiger Schreibvorgang der req.txt Datei
-Ist der Uemis Zürich korrekt verbunden?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>unbekannt</translation>
@@ -6756,6 +6747,26 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>Tauchprotokoll #</translation>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 6ea1b8efd..3b993453f 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Tauchgang Nr.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Datum</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Zeit</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Dauer</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Ort</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Gewicht</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Anfangsdruck</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Enddruck</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Max. Tiefe</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,42 +86,42 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Tauchgruppenleiter</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Tauchpartner</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notizen</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Stichwörter</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Wassertemp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1268,22 +1268,22 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Dauer</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Tiefe</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1745,7 +1745,7 @@
<translation>HTML-Datei exportieren als</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Kann Datei %s nicht öffnen</translation>
</message>
@@ -1758,7 +1758,7 @@
<translation>Tauchprotokolldatei importieren</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
@@ -1793,37 +1793,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Tauchgang Nr.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Dauer</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Stichwörter</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1843,142 +1843,165 @@
<translation>Minuten:Sekunden</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Ort</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Max. Tiefe</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Mittlere Tiefe</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Tauchgruppenleiter</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Tauchpartner</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notizen</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Gewicht</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Anfangsdruck</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Enddruck</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Wassertemp.</translation>
</message>
</context>
<context>
@@ -2485,7 +2508,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Herunterladen</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2560,7 +2583,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Herunterladen</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2580,12 +2603,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Alles auswählen</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Alles abwählen</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2620,8 +2643,8 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Hochladen des Fotos war erfolgreich</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
@@ -2629,17 +2652,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Hochladen des Fotos ist fehlgeschlagen</translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2771,7 +2794,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Tauchmodus</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3934,12 +3957,12 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3960,7 +3983,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4936,7 +4959,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f
<translation>Schließen</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-Plattform Tauchprotokollsoftware&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava und andere, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5067,42 +5090,42 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Neue Version suchen</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Fehlermeldung erhalten:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Dies ist die neuste Subsurfaceversion.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Es gibt eine neue Subsurface-Version.&lt;br/&gt;Klick hier:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; zum Download.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Es gibt eine neue Version von Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Die aktuellste Version ist %1, bitte den Betriebssystem Hersteller kontaktieren.</translation>
</message>
@@ -5141,8 +5164,8 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Benutzerhandbuch</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5226,16 +5249,20 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Betriebssystem: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Prozessor Architektur: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5275,13 +5302,6 @@ Sprache: %1</translation>
<translation>Senden</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-Prozessor Architektur (laut Betriebsystem): %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface konnte die Benutzerumfrage nicht übertragen.</translation>
@@ -5572,7 +5592,7 @@ Durchschnitt</translation>
<translation>(%s) oder (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5797,12 +5817,6 @@ Durchschnitt</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO₂</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>verbleibende Atemzeit</translation>
@@ -5818,6 +5832,8 @@ Durchschnitt</translation>
<translation>Richtung</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6734,31 +6750,6 @@ EADD: %d%s
<translation>Dez</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zürich: Dateisystem beinahe voll
-Bitte den Tauchcomputer ausstecken, wieder einstecken
-und erneut versuchen</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zürich: Dateisystem ist voll.
-Bitte den Tauchcomputer ausstecken, wieder einstecken
-und erneut versuchen</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Unvollständiger Schreibvorgang der req.txt Datei
-Ist der Uemis Zürich korrekt verbunden?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>unbekannt</translation>
@@ -6774,6 +6765,26 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>Tauchprotokoll #</translation>
diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts
index ed8188c7b..7569f89e2 100644
--- a/translations/subsurface_el_GR.ts
+++ b/translations/subsurface_el_GR.ts
@@ -31,22 +31,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Ημερομηνία</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Ώρα</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Διάρκεια</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Τοποθεσία</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Βάρος</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -76,7 +76,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Μέγιστο βάθος</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,22 +86,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Ζευγάρι</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Σημειώσεις</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Ετικέτες</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Διάρκεια</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Βάθος</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1744,7 +1744,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"/>
</message>
@@ -1757,7 +1757,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Ώρα</translation>
</message>
@@ -1792,37 +1792,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Ημερομηνία</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Διάρκεια</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Ετικέτες</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1842,140 +1842,163 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Τοποθεσία</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Μέγιστο βάθος</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Ενδιάμεσο βάθος</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Ζευγάρι</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Σημειώσεις</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Βάρος</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"/>
</message>
@@ -2484,7 +2507,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Λήψη</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2559,7 +2582,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Λήψη</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2619,7 +2642,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2628,17 +2651,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3925,12 +3948,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4923,7 +4946,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Έ&amp;ξοδος</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5054,42 +5077,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5128,8 +5151,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Εγχειρίδιο Χρήσης</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5213,13 +5236,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
+Operating system: %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5259,12 +5288,6 @@ Language: %1</source>
<translation>Αποστολή</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5555,7 +5578,7 @@ SAC (%1)</translation>
<translation>(%s) ή (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5780,12 +5803,6 @@ SAC (%1)</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>airtime</translation>
@@ -5801,6 +5818,8 @@ SAC (%1)</translation>
<translation>heading</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6675,31 +6694,6 @@ EADD: %d%s
<translation>Δεκ</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Το σύστημα αρχείων είναι γεμάτο
-Αποσυνδέστε/επανασυνδέστε τον υπολογιστή κατάδυσης
-και πατήστε &apos;Επανάληψη&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Το σύστημα αρχείων είναι γεμάτο
-Αποσυνδέστε/επανασυνδέστε τον υπολογιστή κατάδυσης
-και προσπαθήστε ξανά</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Μικρή εγγραφή στο αρχείο req.txt
-Είναι το Uemis Zurich σωστά συνδεδεμένο;</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>άγνωστο</translation>
@@ -6715,6 +6709,26 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index 164cf310e..3166e0972 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -26,57 +26,57 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Dive No.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Date</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Time</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duration</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Location</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Weight</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Cyl. size</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Start pressure</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>End pressure</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Max depth</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,76 +86,76 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Buddy</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notes</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Tags</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Air temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Water temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Sample time</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Sample depth</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Sample temperature</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1269,22 +1269,22 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duration</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Depth</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@
<translation>Export HTML files as</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Can&apos;t open file %s</translation>
</message>
@@ -1759,7 +1759,7 @@
<translation>Import dive log file</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Time</translation>
</message>
@@ -1794,37 +1794,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Dive No.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Date</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Duration</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Tags</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1844,142 +1844,165 @@
<translation>Minutes:seconds</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Location</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Max depth</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Sample time</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Sample depth</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
+ <translation>Sample temperature</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+ <source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+ <source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
- <source>Sample cns</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+ <source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
- <source>Sample ndl</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+ <source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
<location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
- <source>Sample tts</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
- <source>Sample stopdepth</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Mean depth</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notes</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Weight</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Cyl. size</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Start pressure</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>End pressure</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Air temp.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Water temp.</translation>
</message>
</context>
<context>
@@ -2486,7 +2509,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Download</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Download</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2581,12 +2604,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Select all</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Deselect all</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,8 +2644,8 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Photo Upload Sucessfull</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
@@ -2630,17 +2653,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Photo Upload Failed</translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2772,7 +2795,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Dive mode</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3935,12 +3958,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3961,7 +3984,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4937,7 +4960,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>&amp;Close</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5068,42 +5091,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Check for updates.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface was unable to check for updates.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>The following error occurred:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Please check your internet connection.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>You are using the latest version of Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>A new version of Subsurface is available.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Latest version is %1, please check with your OS vendor for updates.</translation>
</message>
@@ -5142,8 +5165,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>User Manual</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5227,16 +5250,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Operating System: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-CPU Architecture: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5276,13 +5303,6 @@ Language: %1</translation>
<translation>Send</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS CPU Architecture: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface was unable to submit the user survey.</translation>
@@ -5573,7 +5593,7 @@ Maximum</translation>
<translation>(%s) or (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5798,12 +5818,6 @@ Maximum</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>airtime</translation>
@@ -5819,6 +5833,8 @@ Maximum</translation>
<translation>heading</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6735,31 +6751,6 @@ EADD: %d%s
<translation>Dec</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>unknown</translation>
@@ -6775,6 +6766,26 @@ Is the Uemis Zurich plugged in correctly?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>divelog #</translation>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index 36ee70b9d..4287c12e4 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -26,147 +26,147 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Inmersión #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Fecha</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Hora</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duración</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Ubicación</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Peso</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Tam.botella</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Presión inicial</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Presión final</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Profundidad máxima</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Avg depth</source>
- <translation type="unfinished"/>
+ <translation>Prof.media</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Compañero</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notas</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Etiquetas</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura del aire</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura del agua</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Hora de la muestra</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Profundidad de la muestra</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Temperatura de la muestra</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample stopdepth</source>
- <translation type="unfinished"/>
+ <translation>Profundidad de parada de la muestra</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Presión de la muestra</translation>
</message>
</context>
<context>
@@ -1265,27 +1265,27 @@ el ordenador de buceo seleccionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
<source>Date/time</source>
- <translation type="unfinished"/>
+ <translation>Fecha/hora</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duración</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Prof.</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1747,7 +1747,7 @@ el ordenador de buceo seleccionado?</translation>
<translation>Exportar archivos HTML como</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>No se puede abrir el archivo %s</translation>
</message>
@@ -1760,7 +1760,7 @@ el ordenador de buceo seleccionado?</translation>
<translation>Importar archivo de registro</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Hora de entrada</translation>
</message>
@@ -1792,40 +1792,40 @@ el ordenador de buceo seleccionado?</translation>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
<source>Drag the tags above to each corresponding column below</source>
- <translation type="unfinished"/>
+ <translation>Arrastra las etiquetas de arriba a las columnas correspondientes</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Inmersión #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Fecha</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Duración</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Etiquetas</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1845,142 +1845,165 @@ el ordenador de buceo seleccionado?</translation>
<translation>Minutos:segundos</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Ubicación</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Profundidad máxima</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
- <translation type="unfinished"/>
+ <translation>Pestaña</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
- <translation type="unfinished"/>
+ <translation>Las cabeceras de algunas columnas pueden estar pre-rellenadas, por favor arrastra y suelta las cabeceras para que coincidan con las columnas correctas.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Hora de la muestra</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Profundidad de la muestra</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Temperatura de la muestra</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+ <source>Sample cns</source>
+ <translation>Cns de la muestra</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
- <source>Sample cns</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+ <source>Sample ndl</source>
+ <translation>Lnd de la muestra</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+ <source>Sample tts</source>
+ <translation>Tts de la muestra</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+ <source>Sample stopdepth</source>
+ <translation>Profundidad de parada de la muestra</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
- <source>Sample ndl</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
- <source>Sample tts</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
- <source>Sample stopdepth</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
- <translation type="unfinished"/>
+ <translation>Presión de la muestra</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Presión de la muestra</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Profundidad media</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Compañero</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notas</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Peso</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Tam.botella</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Presión inicial</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Presión final</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura del aire</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura del agua</translation>
</message>
</context>
<context>
@@ -2137,22 +2160,22 @@ el ordenador de buceo seleccionado?</translation>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
<source>Setpoint</source>
- <translation type="unfinished"/>
+ <translation>Setpoint</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
<source>Sensor1</source>
- <translation type="unfinished"/>
+ <translation>Sensor1</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
<source>Sensor2</source>
- <translation type="unfinished"/>
+ <translation>Sensor2</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
<source>Sensor3</source>
- <translation type="unfinished"/>
+ <translation>Sensor3</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
@@ -2162,17 +2185,17 @@ el ordenador de buceo seleccionado?</translation>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
<source>Heart beat</source>
- <translation type="unfinished"/>
+ <translation>Ritmo cardiaco</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
<source>Gradient factor</source>
- <translation type="unfinished"/>
+ <translation>Factor de gradiente</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
<source>Mean depth/s</source>
- <translation type="unfinished"/>
+ <translation>Profundidad/es media/s</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
@@ -2487,7 +2510,7 @@ el ordenador de buceo seleccionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Descargar</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2562,7 +2585,7 @@ el ordenador de buceo seleccionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Descargar</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2577,17 +2600,17 @@ el ordenador de buceo seleccionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
<source>Downloaded Dives</source>
- <translation type="unfinished"/>
+ <translation>Inmersiones descargadas</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Seleccionar todo</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Deseleccionar todo</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2622,12 +2645,17 @@ el ordenador de buceo seleccionado?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Foto subida correctamente</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
<source>Your dive profile was updated to Facebook.</source>
+ <translation>Tu perfil de buceo se ha subido a Facebook.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2635,12 +2663,9 @@ el ordenador de buceo seleccionado?</translation>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>La subida de fotos ha fallado</translation>
+ <translation>Tu perfil de buceo no se ha subido a Fecebook,
+por favor envía lo siguiente al equipo de desarrollo.
+</translation>
</message>
</context>
<context>
@@ -2773,7 +2798,7 @@ el ordenador de buceo seleccionado?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Modo de buceo</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3721,17 +3746,17 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>Open circuit</source>
- <translation type="unfinished"/>
+ <translation>Circuito abierto</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>CCR</source>
- <translation type="unfinished"/>
+ <translation>CCR</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>pSCR</source>
- <translation type="unfinished"/>
+ <translation>pSCR</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="480"/>
@@ -3936,38 +3961,38 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="809"/>
<source>Default CCR set-point for dive planning</source>
- <translation type="unfinished"/>
+ <translation>Setpoint del CCR por defecto para planificación de inmersiones</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="832"/>
<source>pSCR O₂ metabolism rate</source>
- <translation type="unfinished"/>
+ <translation>pSCR Ratio de O₂ en el metabolismo</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="839"/>
<source>pSCR ratio</source>
- <translation type="unfinished"/>
+ <translation>pSCR ratio</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
<source>1:</source>
- <translation type="unfinished"/>
+ <translation>1:</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="875"/>
@@ -4012,7 +4037,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<message>
<location filename="../qt-ui/preferences.ui" line="1079"/>
<source>Disconnect from Facebook</source>
- <translation type="unfinished"/>
+ <translation>Desconectar de Facebook</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="895"/>
@@ -4422,7 +4447,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<message>
<location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
<source>Unknown dive computer</source>
- <translation type="unfinished"/>
+ <translation>Ordenador de buceo desconocido</translation>
</message>
<message>
<location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
@@ -4803,7 +4828,8 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<location filename="../qt-ui/socialnetworks.cpp" line="282"/>
<source>Dive date: %1
</source>
- <translation type="unfinished"/>
+ <translation>Fecha de la inmersión: %1
+</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4828,7 +4854,8 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<location filename="../qt-ui/socialnetworks.cpp" line="290"/>
<source>Dive location: %1
</source>
- <translation type="unfinished"/>
+ <translation>Lugar de la inmersión: %1
+</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4938,7 +4965,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<translation>&amp;Cerrar</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Software de registro de inmersiones multiplataforma&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, y otros, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5069,42 +5096,42 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Buscar actualizaciones</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface no pudo buscar actualizaciones.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Ocurrió el siguiente error:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Por favor, comprueba la conexión a internet.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Está usando la última versión de Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Está disponible una nueva versión de Subsurface.&lt;br/&gt;Pulse en:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para descargarla.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Está disponible una nueva versión de Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>La última versión es %1, por favor, comprueba actualizaciones con el proveedor de tu SO.</translation>
</message>
@@ -5143,8 +5170,8 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Manual de usuario</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5228,16 +5255,20 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Sistema Operativo: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Arquitectura de la CPU: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5277,13 +5308,6 @@ Idioma: %1</translation>
<translation>Enviar</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-Arquitectura del SO CPU : %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface no pudo enviar la encuesta a usuarios.</translation>
@@ -5574,7 +5598,7 @@ Media</translation>
<translation>(%s) o (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5799,12 +5823,6 @@ Media</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>tiempo de aire</translation>
@@ -5820,6 +5838,8 @@ Media</translation>
<translation>encabezado</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6215,7 +6235,7 @@ Media</translation>
<message>
<location filename="../planner.c" line="769"/>
<source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
- <translation type="unfinished"/>
+ <translation>valor de pO₂ bajo %.2f en %d:%02u con gas %s a profundidad %.*f %s</translation>
</message>
<message>
<location filename="../planner.c" line="1085"/>
@@ -6736,31 +6756,6 @@ EADD: %d%s
<translation>Dic</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: El sistema de archivos esta casi lleno
-Desconecte / conecte el ordenador de buceo
-e inténtelo de nuevo</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: sistema de archivos está lleno
-Desconectar / conectar el ordenador de buceo
-e inténtelo de nuevo</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Escritura al archivo req.txt muy corta.
-¿Está el Uemis Zúrich correctamente conectado?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>desconocido</translation>
@@ -6776,6 +6771,26 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>divelog #</translation>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 1268e88df..8f17ed2b4 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -26,27 +26,27 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Sukeldumise #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Kuupäev</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Aeg</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Kestus</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Asukoht</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Raskus</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -76,7 +76,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Max sügavus</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,32 +86,32 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Semu</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Märkmed</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Märgendid</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Õhu temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Vee temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Kestus</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Sügavus</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1744,7 +1744,7 @@
<translation>Ekspordi HTML fail kui</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Ei saa avada faili %s</translation>
</message>
@@ -1757,7 +1757,7 @@
<translation>Impordi sukeldumiste logi fail</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Aeg</translation>
</message>
@@ -1792,37 +1792,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Sukeldumise #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Kuupäev</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Kestus</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Märgendid</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1842,142 +1842,165 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Asukoht</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Max sügavus</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Keskmine sügavus</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Semu</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Märkmed</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Raskus</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Õhu temp.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Vee temp.</translation>
</message>
</context>
<context>
@@ -2484,7 +2507,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Allalaadimine</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2559,7 +2582,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Allalaadimine</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2619,7 +2642,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2628,17 +2651,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3931,12 +3954,12 @@ väärtused</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4929,7 +4952,7 @@ väärtused</translation>
<translation>&amp;Sulge</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5060,42 +5083,42 @@ väärtused</translation>
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Kontrolli kas on uuendusi</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface ei saanud uurida uuenduste kohta.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Tekkis järgmine viga:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Palun kontrolli oma netiühendust.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5134,8 +5157,8 @@ väärtused</translation>
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Kasutusjuhend</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5219,16 +5242,20 @@ väärtused</translation>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Operatsioonisüsteem: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-CPU arhidektuur: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5268,13 +5295,6 @@ Keel: %1</translation>
<translation>Saada</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS CPU Arhidektuur: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface ei suutnud kasutusuuringut edastada.</translation>
@@ -5565,7 +5585,7 @@ Max</translation>
<translation>(%s) või (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5790,12 +5810,6 @@ Max</translation>
<translation>Hapnikulimiidi osa (OLF)</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>aeg õhuga</translation>
@@ -5811,6 +5825,8 @@ Max</translation>
<translation>suund</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6710,30 +6726,6 @@ EADD: %d%s
<translation>Dets</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Surich: failisüsteem on peaaegu täis
-Ühenda lahti/taasühenda kompuuter ja kliki &apos;Uuesti&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Surich: failisüsteem on täis
-Ühenda lahti/taasühenda kompuuter
-ja proovi uuesti&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Lühike märge req.txt faili
-Kas Uemis Zurich on ühendatud korrektselt?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>tundmatu</translation>
@@ -6749,6 +6741,26 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 240eb7e55..cc1e54023 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -26,147 +26,147 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Sukellus</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Ajankohta</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Kello</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Kesto</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Kohde</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Painot</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Säiliön koko</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Alkupaine</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Loppupaine</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Suurin syvyys</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Avg depth</source>
- <translation type="unfinished"/>
+ <translation>Keskisyvyys</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Sukellusvanhin</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Sukelluspari</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Muistiinpanot</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Avainsanat</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Ilman lämpötila</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Veden lämpötila</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Näytteen aika</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Näytteen syvyys</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Näytteen lämpötila</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample stopdepth</source>
- <translation type="unfinished"/>
+ <translation>Näytteen pysähdyssyvyys</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Näytteen säiliöpaine</translation>
</message>
</context>
<context>
@@ -1264,27 +1264,27 @@ poistaa valitun sukellustietokoneen?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
<source>Date/time</source>
- <translation type="unfinished"/>
+ <translation>Päivä/aika</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Kesto</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Syvyys</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>t:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@ poistaa valitun sukellustietokoneen?</translation>
<translation>Vie HTML -tiedostoihin</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Tiedoston avaus ei onnistu %s</translation>
</message>
@@ -1759,7 +1759,7 @@ poistaa valitun sukellustietokoneen?</translation>
<translation>Liitä sukellusloki</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Kello</translation>
</message>
@@ -1791,40 +1791,40 @@ poistaa valitun sukellustietokoneen?</translation>
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
<source>Drag the tags above to each corresponding column below</source>
- <translation type="unfinished"/>
+ <translation>Raahaa yllä olevat tagit alapuolelle vastaaviin sarakkeisiin</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Sukellus</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Ajankohta</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Kesto</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Avainsanat</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1844,142 +1844,165 @@ poistaa valitun sukellustietokoneen?</translation>
<translation>Minuutit:sekunnit</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Kohde</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Suurin syvyys</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
- <translation type="unfinished"/>
+ <translation>Sarkain</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
- <translation type="unfinished"/>
+ <translation>Osa otsakkeista on valmiiksi generoitu; raahaa otsakkeita s.e. ne vastaavat sarakkeiden tietoja.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Näytteen aika</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Näytteen syvyys</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Näytteen lämpötila</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+ <source>Sample cns</source>
+ <translation>Näytteen cns</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
- <source>Sample cns</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+ <source>Sample ndl</source>
+ <translation>Näytteen ndl</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+ <source>Sample tts</source>
+ <translation>Näytteen tts</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+ <source>Sample stopdepth</source>
+ <translation>Näytteen pysähdyssyvyys</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
- <source>Sample ndl</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
- <source>Sample tts</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
- <source>Sample stopdepth</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
- <translation type="unfinished"/>
+ <translation>Näytteen säiliöpaine</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Näytteen säiliöpaine</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Keskisyvyys</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Sukellusvanhin</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Sukelluspari</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Muistiinpanot</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Painot</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Säiliön koko</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Alkupaine</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Loppupaine</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Ilman lämpötila</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Veden lämpötila</translation>
</message>
</context>
<context>
@@ -2136,22 +2159,22 @@ poistaa valitun sukellustietokoneen?</translation>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
<source>Setpoint</source>
- <translation type="unfinished"/>
+ <translation>Setpoint</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
<source>Sensor1</source>
- <translation type="unfinished"/>
+ <translation>Sensori1</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
<source>Sensor2</source>
- <translation type="unfinished"/>
+ <translation>Sensori2</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
<source>Sensor3</source>
- <translation type="unfinished"/>
+ <translation>Sensori3</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
@@ -2161,17 +2184,17 @@ poistaa valitun sukellustietokoneen?</translation>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
<source>Heart beat</source>
- <translation type="unfinished"/>
+ <translation>Syke</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
<source>Gradient factor</source>
- <translation type="unfinished"/>
+ <translation>Gradient Factor</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
<source>Mean depth/s</source>
- <translation type="unfinished"/>
+ <translation>Keskisyvyys/s</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
@@ -2486,7 +2509,7 @@ poistaa valitun sukellustietokoneen?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Lataa</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@ poistaa valitun sukellustietokoneen?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Lataa</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2576,17 +2599,17 @@ poistaa valitun sukellustietokoneen?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
<source>Downloaded Dives</source>
- <translation type="unfinished"/>
+ <translation>Ladatut sukellukset</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Valitse kaikki</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Poista valinnat</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,12 +2644,17 @@ poistaa valitun sukellustietokoneen?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Kuvien lähetys onnistui</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
<source>Your dive profile was updated to Facebook.</source>
+ <translation>Sukellusprofiilis päivitettiin Facebookiin.</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2634,12 +2662,9 @@ poistaa valitun sukellustietokoneen?</translation>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Kuvien lähetys epäonnistui</translation>
+ <translation>Sukellusprofiiliasi ei päivitetty Facebookiin,
+ole hyvä ja lähetä seuraava tieto kehittäjille.
+</translation>
</message>
</context>
<context>
@@ -2772,7 +2797,7 @@ poistaa valitun sukellustietokoneen?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Sukellustyyppi</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3720,17 +3745,17 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>Open circuit</source>
- <translation type="unfinished"/>
+ <translation>Avoin kierto</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>CCR</source>
- <translation type="unfinished"/>
+ <translation>CCR</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="409"/>
<source>pSCR</source>
- <translation type="unfinished"/>
+ <translation>pSCR</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="480"/>
@@ -3935,38 +3960,38 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="809"/>
<source>Default CCR set-point for dive planning</source>
- <translation type="unfinished"/>
+ <translation>Oletus suljetun kierron setpoint sukellus suunnittelussa</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="832"/>
<source>pSCR O₂ metabolism rate</source>
- <translation type="unfinished"/>
+ <translation>pSCR O₂ aineenvaihdunnan nopeus</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="839"/>
<source>pSCR ratio</source>
- <translation type="unfinished"/>
+ <translation>pSCR -suhde</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
<source>1:</source>
- <translation type="unfinished"/>
+ <translation>1:</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="875"/>
@@ -4011,7 +4036,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<message>
<location filename="../qt-ui/preferences.ui" line="1079"/>
<source>Disconnect from Facebook</source>
- <translation type="unfinished"/>
+ <translation>Katkaise yhteys Facebookiin</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="895"/>
@@ -4422,7 +4447,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<message>
<location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
<source>Unknown dive computer</source>
- <translation type="unfinished"/>
+ <translation>Tuntematon sukellustietokone</translation>
</message>
<message>
<location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
@@ -4803,7 +4828,8 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<location filename="../qt-ui/socialnetworks.cpp" line="282"/>
<source>Dive date: %1
</source>
- <translation type="unfinished"/>
+ <translation>Sukelluspäivä: %1
+</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4828,7 +4854,8 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<location filename="../qt-ui/socialnetworks.cpp" line="290"/>
<source>Dive location: %1
</source>
- <translation type="unfinished"/>
+ <translation>Sukelluskohde: %1
+</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4938,7 +4965,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<translation>Sulje</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Sukelluslokiohjelmisto useille käyttöjärjestelmäalustoille&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5069,42 +5096,42 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Tarkista päivitykset.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Päivitysten tarkistus epäonnistui.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Tapahtui seuraava virhe:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Tarkista Internetyhteys.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Käytössä on uusin versio Subsurfacesta.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Saatavilla on uusi versio Subsurfacesta.&lt;br/&gt;Näpäytä:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; ladataksesi sen.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Saatavilla on uusi versio Subsurfacesta.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Uusin versio on %1, tarkista päivityksen saatavuus käyttöjärjestelmäsi valmistajlata.</translation>
</message>
@@ -5143,8 +5170,8 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Käyttöohje</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5228,16 +5255,20 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Käyttöjärjestelmä: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-CPU arkkitehtuuri: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5277,12 +5308,6 @@ Kieli: %1</translation>
<translation>Lähetä</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>Käyttöjärjestelmän CPU arkkitehtuuri: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Kyselyn lähettäminen epäonnistui.</translation>
@@ -5573,7 +5598,7 @@ Keski</translation>
<translation>(%s) tai (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5798,12 +5823,6 @@ Keski</translation>
<translation>Happikertymä</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>Ilma-aika</translation>
@@ -5819,6 +5838,8 @@ Keski</translation>
<translation>suunta</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6216,7 +6237,7 @@ Keski</translation>
<message>
<location filename="../planner.c" line="769"/>
<source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
- <translation type="unfinished"/>
+ <translation>matala pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation>
</message>
<message>
<location filename="../planner.c" line="1085"/>
@@ -6736,31 +6757,6 @@ EADD: %d%s
<translation>joulu</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: tiedostojärjestelmä on lähes täynnä.
-Liitä sukellustietokone uudestaan
-ja yritä uudestaan.</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Tiedostojärjestelmä on täynnä.
-Liitä sukellustietokone uudestaan
-ja yritä uudestaan.</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Tiedoston req.txt kirjoittaminen epäonnistui.
-Onko Uemis Zurich kytketty oikein?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>tuntematon</translation>
@@ -6776,6 +6772,26 @@ Onko Uemis Zurich kytketty oikein?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>sukellusloki #</translation>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 2c93ab2ba..275f09231 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Plongée n°</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Date</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Heure</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Durée</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Lieu</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Poids</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Pression de départ</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Pression finale</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Profondeur max.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,42 +86,42 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Moniteur / Guide de palanquée</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Équipier</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notes</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Étiquettes</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. de l&apos;air</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. de l&apos;eau</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1269,22 +1269,22 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Durée</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Profondeur</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1747,7 +1747,7 @@
<translation>Exporter le fichier HTML comme</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Impossible d&apos;ouvrir le fichier %s</translation>
</message>
@@ -1760,7 +1760,7 @@
<translation>Importer des plongées depuis un fichier</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Heure</translation>
</message>
@@ -1795,37 +1795,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Plongée n°</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Date</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Durée</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Étiquettes</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1845,142 +1845,165 @@
<translation>Minutes:secondes</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Lieu</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Profondeur max.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Prof. moyenne</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Moniteur / Guide de palanquée</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Équipier</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notes</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Poids</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Pression de départ</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Pression finale</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. de l&apos;air</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. de l&apos;eau</translation>
</message>
</context>
<context>
@@ -2487,7 +2510,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Télécharger</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2562,7 +2585,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Télécharger</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2582,12 +2605,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Tout sélectionner</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Tout désélectionner</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2622,8 +2645,8 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Envoi des photos réussi</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
@@ -2631,17 +2654,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Échec de l&apos;envoi des photos</translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2773,7 +2796,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Mode de plongée</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3936,12 +3959,12 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3962,7 +3985,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4938,7 +4961,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
<translation>&amp;Fermer</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Logiciel multiplateforme&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, et autres, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5069,42 +5092,42 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Vérifier les mises à jour.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface n&apos;a pas été en mesure de vérifier les mises à jour.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>L&apos;erreur suivante est apparue :</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Vérifiez votre connexion Internet.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Vous utilisez la dernière version de Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Une nouvelle version de Subsurface est disponible.&lt;br/&gt;Téléchargez-là sur :&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Une nouvelle version de Subsurface est disponible.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>La dernière version est %1, renseignez-vous auprès de votre fournisseur pour d&apos;éventuelles mises à jour.</translation>
</message>
@@ -5143,8 +5166,8 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Manuel utilisateur</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5228,16 +5251,20 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Système d&apos;exploitation : %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Architecture CPU : %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5277,14 +5304,6 @@ Langue : %1</translation>
<translation>Envoyer</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-
-Architecture OS CPU : %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface n&apos;a pas pu soumettre le sondage utilisateur.</translation>
@@ -5575,7 +5594,7 @@ Maximum</translation>
<translation>(%s) ou (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5800,12 +5819,6 @@ Maximum</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>Durée à l&apos;air</translation>
@@ -5821,6 +5834,8 @@ Maximum</translation>
<translation>entête</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6726,31 +6741,6 @@ PEDA : %d%s
<translation>Déc.</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich  : le système de fichier est presque plein
-Débrancher puis rebrancher l&apos;ordinateur de plongée
-et cliquer sur &apos;Réessayer&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich  : le système de fichier est plein
-Débrancher puis rebrancher l&apos;ordinateur de plongée
-et réessayer</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Écriture partielle dans le fichier req.txt
-Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>inconnu</translation>
@@ -6766,6 +6756,26 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>Plongée #</translation>
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index 4a59dd0a1..e3cd60cd1 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -31,22 +31,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>תאריך</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>זמן</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>משך הצלילה</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>מיקום</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>משקל</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -86,22 +86,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>מדריך צלילה</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>בן זוג</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>הערות</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>תגיות</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1266,12 +1266,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>משך הצלילה</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>עומק</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1281,7 +1281,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>דקה</translation>
</message>
</context>
<context>
@@ -1743,7 +1743,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"/>
</message>
@@ -1756,7 +1756,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>זמן</translation>
</message>
@@ -1791,37 +1791,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>תאריך</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>משך הצלילה</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>תגיות</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1841,140 +1841,163 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>מיקום</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>מדריך צלילה</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>בן זוג</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>הערות</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>משקל</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"/>
</message>
@@ -2483,7 +2506,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>הורדה</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2558,7 +2581,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>הורדה</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2618,7 +2641,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2627,17 +2650,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3924,12 +3947,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4922,7 +4945,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>&amp;סגור</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5053,42 +5076,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5127,8 +5150,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>מדריך משתמש</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5212,13 +5235,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
+Operating system: %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5258,12 +5287,6 @@ Language: %1</source>
<translation>שלח</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5554,7 +5577,7 @@ Maximum</source>
<translation>(%S) או (%S)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5779,12 +5802,6 @@ Maximum</source>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>זמן אויר</translation>
@@ -5800,6 +5817,8 @@ Maximum</source>
<translation>כותרת</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6674,41 +6693,41 @@ EADD: %d%s
<translation>דצמבר</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="111"/>
+ <source>unknown</source>
+ <translation>לא ידוע</translation>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="431"/>
+ <source>data</source>
+ <translation>נתונים</translation>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="411"/>
+ <source>%s %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
+ <source>Uemis Zurich: the file system is almost full.
Disconnect/reconnect the dive computer
and click &apos;Retry&apos;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
+ <source>Uemis Zurich: the file system is full.
Disconnect/reconnect the dive computer
and try again</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
+ <source>Short write to req.txt file.
Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../uemis-downloader.c" line="111"/>
- <source>unknown</source>
- <translation>לא ידוע</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="431"/>
- <source>data</source>
- <translation>נתונים</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="411"/>
- <source>%s %s</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 3dd6f62ae..deee2862d 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -31,22 +31,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Datum</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Vrijeme</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Trajanje</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Lokacija</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Težina</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -86,17 +86,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Voditelj</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Buddy</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Bilješke</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1266,12 +1266,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Trajanje</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Dubina</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1281,7 +1281,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1743,7 +1743,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"/>
</message>
@@ -1756,7 +1756,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Vrijeme</translation>
</message>
@@ -1791,37 +1791,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Trajanje</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1841,140 +1841,163 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Lokacija</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Voditelj</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Bilješke</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Težina</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"/>
</message>
@@ -2617,7 +2640,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2626,17 +2649,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3923,12 +3946,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4921,7 +4944,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5052,42 +5075,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5126,8 +5149,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Korisnički priručnik</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5211,13 +5234,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
+Operating system: %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5257,12 +5286,6 @@ Language: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5543,7 +5566,7 @@ Maximum</source>
<translation>(%s) ili (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5768,12 +5791,6 @@ Maximum</source>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>preostalo trajanje zraka</translation>
@@ -5789,6 +5806,8 @@ Maximum</source>
<translation>kurs</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation type="unfinished"/>
@@ -6662,31 +6681,6 @@ EADD: %d%s
<translation>Pro</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Datotečni sustav je skoro pun
-odspojite pa ponovo spojite ronilačko računalo
-i kliknite &apos;Retry&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Datotečni sustav je pun
-Iskopčajte i ponovo ukopčajte ronilačko računalo
-i pokušajte ponovo.</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Greška pri pisanju u datoteku req.txt
-Je li Uemis Zurich ispravno priključen?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>nepoznato</translation>
@@ -6702,6 +6696,26 @@ Je li Uemis Zurich ispravno priključen?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts
index c5b50b116..44d4e6ba7 100644
--- a/translations/subsurface_hu.ts
+++ b/translations/subsurface_hu.ts
@@ -31,22 +31,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Dátum</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Idő</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Tartam</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Hely</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -86,12 +86,12 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Merülés vezető</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Társ</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1266,12 +1266,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Tartam</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Mélység</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1743,7 +1743,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"/>
</message>
@@ -1756,7 +1756,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Idő</translation>
</message>
@@ -1791,37 +1791,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Dátum</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Tartam</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1841,140 +1841,163 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Hely</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Merülés vezető</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Társ</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"/>
</message>
@@ -2617,7 +2640,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2626,17 +2649,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3923,12 +3946,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4921,7 +4944,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5052,42 +5075,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5126,7 +5149,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
+ <source>User manual</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5211,13 +5234,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
+Operating system: %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5257,12 +5286,6 @@ Language: %1</source>
<translation>Küldés</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5543,7 +5566,7 @@ Maximum</source>
<translation>(%s) vagy (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5768,12 +5791,6 @@ Maximum</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation type="unfinished"/>
@@ -5789,6 +5806,8 @@ Maximum</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation type="unfinished"/>
@@ -6659,38 +6678,38 @@ EADD: %d%s
<translation>Dec</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
+ <location filename="../uemis-downloader.c" line="111"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
+ <location filename="../uemis-downloader.c" line="431"/>
+ <source>data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
+ <location filename="../uemis-downloader.c" line="411"/>
+ <source>%s %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../uemis-downloader.c" line="111"/>
- <source>unknown</source>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../uemis-downloader.c" line="431"/>
- <source>data</source>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../uemis-downloader.c" line="411"/>
- <source>%s %s</source>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index b3e945a3f..c51e533bd 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -31,7 +31,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Tanggal</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -41,12 +41,12 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Durasi</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Lokasi</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Berat</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -86,17 +86,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Rekan</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Catatan</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1266,12 +1266,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Durasi</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>edalaman</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1281,7 +1281,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>menit</translation>
</message>
</context>
<context>
@@ -1743,7 +1743,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"/>
</message>
@@ -1756,7 +1756,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation type="unfinished"/>
</message>
@@ -1791,37 +1791,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Tanggal</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Durasi</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1841,140 +1841,163 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Lokasi</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Rekan</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Catatan</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Berat</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"/>
</message>
@@ -2617,7 +2640,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2626,17 +2649,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3923,12 +3946,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4921,7 +4944,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5052,42 +5075,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5126,7 +5149,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
+ <source>User manual</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5211,13 +5234,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
+Operating system: %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5257,12 +5286,6 @@ Language: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5551,7 +5574,7 @@ Rata-rata</translation>
<translation>(%s) or (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5776,12 +5799,6 @@ Rata-rata</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>waktu mengudara</translation>
@@ -5797,6 +5814,8 @@ Rata-rata</translation>
<translation>judul</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation type="unfinished"/>
@@ -6667,41 +6686,41 @@ EADD: %d%s
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="111"/>
+ <source>unknown</source>
+ <translation>Tak dikenal</translation>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="431"/>
+ <source>data</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="411"/>
+ <source>%s %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
+ <source>Uemis Zurich: the file system is almost full.
Disconnect/reconnect the dive computer
and click &apos;Retry&apos;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
+ <source>Uemis Zurich: the file system is full.
Disconnect/reconnect the dive computer
and try again</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
+ <source>Short write to req.txt file.
Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../uemis-downloader.c" line="111"/>
- <source>unknown</source>
- <translation>Tak dikenal</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="431"/>
- <source>data</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="411"/>
- <source>%s %s</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index 9f7210f6a..1334316f4 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Immersione nº</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Ora</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Durata</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Luogo</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Peso</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Pressione iniziale</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Pressione finale</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Profondità massima</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,42 +86,42 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Compagno</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Note</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Tags</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura atmosferica</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura dell&apos;acqua</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1269,22 +1269,22 @@ il computer selezionato?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Durata</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Profondità</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@ il computer selezionato?</translation>
<translation>Esporta file HTML come</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Non posso aprire il file %s</translation>
</message>
@@ -1759,7 +1759,7 @@ il computer selezionato?</translation>
<translation>Importa log delle immersioni da file</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Ora</translation>
</message>
@@ -1794,37 +1794,37 @@ il computer selezionato?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Immersione nº</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Data</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Durata</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Tags</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1844,142 +1844,165 @@ il computer selezionato?</translation>
<translation>Minuti:secondi</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Luogo</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Profondità massima</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Profondità media</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Compagno</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Note</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Peso</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Pressione iniziale</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Pressione finale</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura atmosferica</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura dell&apos;acqua</translation>
</message>
</context>
<context>
@@ -2486,7 +2509,7 @@ il computer selezionato?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Download</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@ il computer selezionato?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Download</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2581,12 +2604,12 @@ il computer selezionato?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Seleziona tutto</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Deseleziona tutto</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,8 +2644,8 @@ il computer selezionato?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Caricamento delle foto eseguito con successo</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
@@ -2630,17 +2653,17 @@ il computer selezionato?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Caricamento delle foto fallito</translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2772,7 +2795,7 @@ il computer selezionato?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Modalità immersione</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3935,12 +3958,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3961,7 +3984,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4937,7 +4960,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
<translation>&amp;Chiudi</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5068,42 +5091,42 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Controlla gli aggiornamenti.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface non è riuscito a controllare gli aggiornamenti.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Si è verificato il seguente errore:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Per favore controlla la tua connessione Internet</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Stai usando la versione più recente di Subsurface</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>E&apos; disponibile una nuova versione di Subsurface.&lt;br/&gt;Clicca su:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; per scaricarla.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>E&apos; disponibile una nuova versione di Subsurface</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>La versione più recente è %1, controlla gli aggiornamenti del tuo sistema operativo.</translation>
</message>
@@ -5142,8 +5165,8 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Manuale Utente</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5227,16 +5250,20 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
- Sistema Operativo: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Architettura CPU : %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5276,13 +5303,6 @@ Lingua: %1</translation>
<translation>Invia</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS Architettura CPU: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface non è stato in grado di inviare il sondaggio.</translation>
@@ -5573,7 +5593,7 @@ Media</translation>
<translation>(%s) oder (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5798,12 +5818,6 @@ Media</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>tempo in aria</translation>
@@ -5819,6 +5833,8 @@ Media</translation>
<translation>intestazione</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6736,31 +6752,6 @@ EADD: %d%s
<translation>Dic</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Il File System è quasi pieno
-Disconnettere/riconnettere il computer subacqueo
-e cliccare &quot;Riprova&quot;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: File System pieno
-Disconnettere/connettere il computer
-e riprovare</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Scrittura breve sul file req.txt
-Lo Uemis Zurich e&apos; collegato correttamente?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>sconosciuto</translation>
@@ -6776,6 +6767,26 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>divelog #</translation>
diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts
index db0552a16..730a26050 100644
--- a/translations/subsurface_lv_LV.ts
+++ b/translations/subsurface_lv_LV.ts
@@ -26,27 +26,27 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Niršana #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Datums</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Laiks</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Ilgums</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Vieta</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Svars</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -76,7 +76,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Maks. dziļums</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,32 +86,32 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Niršanas speciālists</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Draugs</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Piezīmes</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Tagi</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Gaisa temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Ūdens temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@ likvidēt izvēlētus datorus?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Ilgums</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Dziļums</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@ likvidēt izvēlētus datorus?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1744,7 +1744,7 @@ likvidēt izvēlētus datorus?</translation>
<translation>Eksportēt HTML failus, kā</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Nevar atvērt failu %s</translation>
</message>
@@ -1757,7 +1757,7 @@ likvidēt izvēlētus datorus?</translation>
<translation>Niršanas žurnālu importēšana</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Laiks</translation>
</message>
@@ -1792,37 +1792,37 @@ likvidēt izvēlētus datorus?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Niršana #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Datums</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Ilgums</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Tagi</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1842,142 +1842,165 @@ likvidēt izvēlētus datorus?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Vieta</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Maks. dziļums</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Vid. dziļums</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Niršanas speciālists</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Draugs</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Piezīmes</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Svars</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Gaisa temp.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Ūdens temp.</translation>
</message>
</context>
<context>
@@ -2484,7 +2507,7 @@ likvidēt izvēlētus datorus?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Lejupielādēt</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2559,7 +2582,7 @@ likvidēt izvēlētus datorus?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Lejupielādēt</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2619,7 +2642,7 @@ likvidēt izvēlētus datorus?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2628,17 +2651,17 @@ likvidēt izvēlētus datorus?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3929,12 +3952,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4927,7 +4950,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Azivērt</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5058,42 +5081,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Pārbaudīt atjaunāšanas.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface&apos;am neizdevas pārbaudīt atjaunāšanas</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Sekojoša kļūda gadījas:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Lūdzu, pārbaudiet interneta pieslēgšanu.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5132,8 +5155,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Lietotāja rokasgrāmata</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5217,16 +5240,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Operētājsistēma: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-CPU Arhitektūra: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5266,13 +5293,6 @@ Valoda: %1</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS CPU Arhitektūra: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5563,7 +5583,7 @@ Vidējais</translation>
<translation>(%s) vai (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5788,12 +5808,6 @@ Vidējais</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO₂</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>skābekļa laiks</translation>
@@ -5809,6 +5823,8 @@ Vidējais</translation>
<translation>virziens</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6715,31 +6731,6 @@ EADD: %d%s
<translation>Dec</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Failu sistēma ir gandrīz pilna
-Atslēdziet/pieslēdziet niršanas datoru
-un nospiediet &apos;Atkārtot&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Failu sistēma ir gandrīz pilna
-Atslēdziet/pieslēdziet niršanas datoru
-un mēģiniet vēlreiz</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Pārtraukta req.txt faila ierakstīšana
-Vai Uemis Zurich ir pareizi pieslēgts?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>nezināms</translation>
@@ -6755,6 +6746,26 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index 6131e147b..7e5d0559c 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -26,27 +26,27 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Dykk #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Dato</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Tid</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Varighet</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Sted</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Vekt</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -76,7 +76,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Maksdybde</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,32 +86,32 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Dykkeleder</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Buddy</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notater</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Emner</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Vanntemp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1266,12 +1266,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Varighet</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Dybde</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1281,7 +1281,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1743,7 +1743,7 @@
<translation>Eksporter HTML-filer som</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Klarer ikke åpne fila %s</translation>
</message>
@@ -1756,7 +1756,7 @@
<translation>Importer dykkelogg</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Tid</translation>
</message>
@@ -1791,37 +1791,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Dykk #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Dato</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Varighet</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Emner</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1841,142 +1841,165 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Sted</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Maksdybde</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Snittdybde</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Dykkeleder</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notater</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Vekt</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Vanntemp.</translation>
</message>
</context>
<context>
@@ -2483,7 +2506,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Last ned</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2558,7 +2581,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Last ned</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2578,12 +2601,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Velg alle</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Velg vekk alle</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2618,7 +2641,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2627,17 +2650,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2769,7 +2792,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Dykkemodus</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3930,12 +3953,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4928,7 +4951,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Lukk</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5059,42 +5082,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Se etter oppdateringer.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface klarte ikke å se etter oppdateringer.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Den følgende feilen inntraff:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Sjekk internettforbindelsen din.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5133,8 +5156,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Brukermanual</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5218,14 +5241,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>Operativsystem: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>Prosessorarktitektur: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5264,13 +5293,6 @@ Language: %1</source>
<translation>Send</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS CPU-arkitektur: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface klarte ikke å sende inn undersøkelsen.</translation>
@@ -5561,7 +5583,7 @@ Snitt</translation>
<translation>(%s) eller (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5786,12 +5808,6 @@ Snitt</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>pO₂</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>lufttid</translation>
@@ -5807,6 +5823,8 @@ Snitt</translation>
<translation>retning</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6711,31 +6729,6 @@ EADD: %d%s
<translation>des</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Filsystem er nesten fullt
-Koble fra og til dykkecomputeren og
-klikk &apos;Prøv igjen&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Fullt filsystem
-Koble fra og til dykkecomputeren
-og prøv igjen</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Fikk ikke skrevet ferdig req.txt
-Er Uemis Zurich plugget i ordentlig?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>ukjent</translation>
@@ -6751,6 +6744,26 @@ Er Uemis Zurich plugget i ordentlig?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 5cb3103b9..241cbbd5e 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -26,147 +26,147 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Duik #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Datum</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Tijd</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duur</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Locatie</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Gewicht</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Formaat fles</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Startdruk</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Einddruk</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Max diepte</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Avg depth</source>
- <translation type="unfinished"/>
+ <translation>Gem. diepte</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Duikleider</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Buddy</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notities</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Trefwoorden</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lucht temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Water temp.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld tijd</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld diepte</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld temperatuur</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample stopdepth</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld diepte stop</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld druk</translation>
</message>
</context>
<context>
@@ -1264,27 +1264,27 @@ duikcomputer wilt verwijderen?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
<source>Date/time</source>
- <translation type="unfinished"/>
+ <translation>Datum/tijd</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duur</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Diepte</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>u:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@ duikcomputer wilt verwijderen?</translation>
<translation>Exporteer HTML bestanden als</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Kan het bestand %s niet openen</translation>
</message>
@@ -1759,7 +1759,7 @@ duikcomputer wilt verwijderen?</translation>
<translation>Duiklogboek importeren</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Tijd</translation>
</message>
@@ -1794,37 +1794,37 @@ duikcomputer wilt verwijderen?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Duik #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Duur</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Trefwoorden</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1844,142 +1844,165 @@ duikcomputer wilt verwijderen?</translation>
<translation>Minuten:seconden</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Locatie</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Max diepte</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld tijd</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld diepte</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld temperatuur</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+ <source>Sample cns</source>
+ <translation>Voorbeeld cns</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
- <source>Sample cns</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+ <source>Sample ndl</source>
+ <translation>Voorbeeld ndl</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+ <source>Sample tts</source>
+ <translation>Voorbeeld tts</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+ <source>Sample stopdepth</source>
+ <translation>Voorbeeld diepte stop</translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
- <source>Sample ndl</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
- <source>Sample tts</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
- <source>Sample stopdepth</source>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
- <translation type="unfinished"/>
+ <translation>Voorbeeld druk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Gemiddelde diepte</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Duikleider</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notities</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Gewicht</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
- <translation type="unfinished"/>
+ <translation>Formaat fles</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Startdruk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Einddruk</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lucht temp.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Water temp.</translation>
</message>
</context>
<context>
@@ -2486,7 +2509,7 @@ duikcomputer wilt verwijderen?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Downloaden</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@ duikcomputer wilt verwijderen?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Downloaden</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2581,12 +2604,12 @@ duikcomputer wilt verwijderen?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Alles selecteren</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Selectie ongedaan maken</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,8 +2644,8 @@ duikcomputer wilt verwijderen?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Foto opladen gelukt</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
@@ -2630,17 +2653,17 @@ duikcomputer wilt verwijderen?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Foto opladen mislukt</translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2772,7 +2795,7 @@ duikcomputer wilt verwijderen?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Duikmodus</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3935,12 +3958,12 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3961,7 +3984,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4937,7 +4960,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
<translation>Sluiten</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform duiklogboek&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava en anderen, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5068,42 +5091,42 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Zoek naar updates.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface kon niet zoeken naar updates.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>De volgende fout trad op:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Controleer uw internetverbinding.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>U gebruikt de meest recente versie van Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Er is een nieuwe versie van Subsurface beschikbaar.&lt;br/&gt;Klik op:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; om te downloaden.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Er is een nieuwe versie van Subsurface beschikbaar.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>De nieuwste versie is %1. Neem contact op met de verdeler van uw besturingssysteem voor updates.</translation>
</message>
@@ -5142,8 +5165,8 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Handleiding</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5227,16 +5250,20 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Besturingssysteem: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Centrale verwerkingseenheid: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5276,13 +5303,6 @@ Taal: %1</translation>
<translation>Verzend</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-Besturingssysteem CPU %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface kon de gebruikersenquete niet verzenden.</translation>
@@ -5573,7 +5593,7 @@ Maximum</translation>
<translation>(%s) of (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5798,12 +5818,6 @@ Maximum</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO₂</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>resterende luchttijd</translation>
@@ -5819,6 +5833,8 @@ Maximum</translation>
<translation>koers</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6735,31 +6751,6 @@ EADD: %d%s
<translation>dec</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Bestandssysteem bijna vol
-AUB de duikcomputer loskoppelen en weer aansluiten
-en klik op &apos;Opnieuw&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Bestandssysteem vol
-AUB de duikcomputer loskoppellen en weer aansluiten
-en probeer opnieuw</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Gedeeltelijke schrijfvoortgang naar req.txt bestand
-Is de Uemis Zurich correkt aangesloten?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>onbekend</translation>
@@ -6775,6 +6766,26 @@ Is de Uemis Zurich correkt aangesloten?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>duiklog #</translation>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index d49bdc0bc..19f6955a0 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Nurkowanie nr</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Czas</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Czas trwania</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Miejsce</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Balast</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Ciśnienie początkowe</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Ciśnienie końcowe</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Głębokość maksymalna</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,42 +86,42 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Partner</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Opis</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Tagi</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. powietrza</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. wody</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1269,22 +1269,22 @@ wybrany komputer nurkowy?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Czas trwania</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Głębokość</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@ wybrany komputer nurkowy?</translation>
<translation>Eksportuj pliki HTML jako</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Nie można otworzyć pliku %s</translation>
</message>
@@ -1759,7 +1759,7 @@ wybrany komputer nurkowy?</translation>
<translation>Importowanie logów nurkowych</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Czas</translation>
</message>
@@ -1794,37 +1794,37 @@ wybrany komputer nurkowy?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Nurkowanie nr</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Data</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Czas</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Tagi</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1844,142 +1844,165 @@ wybrany komputer nurkowy?</translation>
<translation>Minuty:sekundy</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Miejsce</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Głębokość maksymalna</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Głębokość średnia</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Partner</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Opis</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Balast</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Ciśnienie początkowe</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Ciśnienie końcowe</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. powietrza</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. wody</translation>
</message>
</context>
<context>
@@ -2486,7 +2509,7 @@ wybrany komputer nurkowy?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Pobierz</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@ wybrany komputer nurkowy?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Pobierz</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2581,12 +2604,12 @@ wybrany komputer nurkowy?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Wybierz wszystko</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Odznacz wszystko</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,8 +2644,8 @@ wybrany komputer nurkowy?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Wysyłanie zdjęć zakończone sukcesem</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
@@ -2630,17 +2653,17 @@ wybrany komputer nurkowy?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Wysyłanie zdjęć nieudane</translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2772,7 +2795,7 @@ wybrany komputer nurkowy?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Tryb pracy</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3936,12 +3959,12 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3962,7 +3985,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4938,7 +4961,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
<translation>Zamknij</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Wieloplatformowy log nurkowy&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava i inni, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5069,42 +5092,42 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Sprawdzanie dostępności aktualizacji.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Nie udało się sprawdzić dostępności aktualizacji.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Natrafiono na następujący błąd:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Sprawdź proszę swoje połączenie z Internetem.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Używasz najnowszej wersji Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Nowa wersja Subsurface jest dostępna.&lt;br/&gt;Kliknij na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; aby ją pobrać.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Nowsza wersja Subsurface jest dostępna.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Najnowsza wersja to %1, sprawdź dostępność aktualizacji u dostawcy swojego systemu operacyjnego.</translation>
</message>
@@ -5143,8 +5166,8 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>instrukcja obsługi</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5228,16 +5251,20 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-System Operacyjny: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Architektura CPU: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5277,13 +5304,6 @@ Język: %1</translation>
<translation>Wyślij</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-Architektura OS CPU: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface nie był w stanie wysłać ankiety.</translation>
@@ -5569,7 +5589,7 @@ Maximum</source>
<translation>(%s) lub (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5794,12 +5814,6 @@ Maximum</source>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>Pozostały czas oddychania</translation>
@@ -5815,6 +5829,8 @@ Maximum</source>
<translation>kierunek</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6733,31 +6749,6 @@ EADD: %d%s
<translation>Gru</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: System plików jest prawie pełen
-Odłącz i podłącz ponownie komputer nurkowy
-i wybierz &apos;Ponów&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: System plików jest pełen
-Odłącz i podłącz ponownie komputer nurkowy
-i spróbuj jeszcze raz.</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Nieudany zapis do pliku req.txt
-Czy Uemis Zurich jest podłączony poprawnie?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>nieznana</translation>
@@ -6773,6 +6764,26 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>log #</translation>
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index cb4576a65..18aa07f9a 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -26,27 +26,27 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Mergulho nº</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Horário</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duração</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Local</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Peso</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -76,7 +76,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Profundidade máxima</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,32 +86,32 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Parceiro</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notas</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Rótulos</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura do ar</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura da água</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duração</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Profundidade</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1744,7 +1744,7 @@ o computador de mergulho selecionado?</translation>
<translation>Exportar arquivo HTML como</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Não é possivel abrir o arquivo %s</translation>
</message>
@@ -1757,7 +1757,7 @@ o computador de mergulho selecionado?</translation>
<translation>Importar arquivo com log de mergulho</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Horário</translation>
</message>
@@ -1792,37 +1792,37 @@ o computador de mergulho selecionado?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Mergulho nº</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Data</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Duração</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Rótulos</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1842,142 +1842,165 @@ o computador de mergulho selecionado?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Local</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Profundidade máxima</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Profundidade média</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Parceiro</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notas</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Peso</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura do ar</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temperatura da água</translation>
</message>
</context>
<context>
@@ -2484,7 +2507,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Receber</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2559,7 +2582,7 @@ o computador de mergulho selecionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Receber</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2619,7 +2642,7 @@ o computador de mergulho selecionado?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2628,17 +2651,17 @@ o computador de mergulho selecionado?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3931,12 +3954,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4929,7 +4952,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Fe&amp;char</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5060,42 +5083,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Buscar atualizações.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface não conseguiu localizar updates</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>O seguinte erro ocorreu</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Por favor, verifique sua conexão a internet</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5134,8 +5157,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Manual do Usuário</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5219,16 +5242,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Sistema Operacional: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Arquitetura do Processador: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5268,12 +5295,6 @@ Lingua: %1</translation>
<translation>Enviar</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface não conseguiu enviar a pesquisa</translation>
@@ -5564,7 +5585,7 @@ Médio</translation>
<translation>(%s) ou (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5789,12 +5810,6 @@ Médio</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>tempo de ar</translation>
@@ -5810,6 +5825,8 @@ Médio</translation>
<translation>direção</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6713,31 +6730,6 @@ EADD: %d%s
<translation>Dez</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: O sistema de arquivos está quase cheio
-Desconecte e reconecte novamente o computador de mergulho
-e clique em &quot;Repetir&quot;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Sistema de arquivos está cheio
-Desconecte e reconecte o computador de mergulho
-e tente novamente</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Escrita curta no arquivo req.txt.
-O Uemis Zurich está conectado corretamente?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>desconhecido</translation>
@@ -6753,6 +6745,26 @@ O Uemis Zurich está conectado corretamente?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index 844f321d6..284093db6 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Mergulho #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Tempo</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duração</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Local</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Peso</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Pressão inicial</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Pressão final</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Prof. Max.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,42 +86,42 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Guia de mergulho</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Companheiros</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notas</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Etiquetas</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. do ar</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. da água</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1269,22 +1269,22 @@ remover o computador de mergulho seleccionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Duração</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Profundidade</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@ remover o computador de mergulho seleccionado?</translation>
<translation>Exportar ficheiros HTML como</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Não é possível abrir o ficheiro %s</translation>
</message>
@@ -1759,7 +1759,7 @@ remover o computador de mergulho seleccionado?</translation>
<translation>Importar ficheiro de livro de registos</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Tempo</translation>
</message>
@@ -1794,37 +1794,37 @@ remover o computador de mergulho seleccionado?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Mergulho #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Data</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Duração</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Etiquetas</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1844,142 +1844,165 @@ remover o computador de mergulho seleccionado?</translation>
<translation>Minutos:segundos</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Local</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Prof. Max.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Profundidade média</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Guia de mergulho</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Companheiros</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notas</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Peso</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Pressão inicial</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Pressão final</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. do ar</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Temp. da água</translation>
</message>
</context>
<context>
@@ -2486,7 +2509,7 @@ remover o computador de mergulho seleccionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Descarregar</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@ remover o computador de mergulho seleccionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Descarregar</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2581,12 +2604,12 @@ remover o computador de mergulho seleccionado?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Seleccionar tudo</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Não seleccionar tudo</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,8 +2644,8 @@ remover o computador de mergulho seleccionado?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>O carregamento das fotografias foi efectuado com sucesso</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
@@ -2630,17 +2653,17 @@ remover o computador de mergulho seleccionado?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>O carregamento das fotos falhou</translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2772,7 +2795,7 @@ remover o computador de mergulho seleccionado?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Modo de mergulho</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3935,12 +3958,12 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3961,7 +3984,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4937,7 +4960,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
<translation>&amp;Fechar</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Aplicação de registo de mergulhos multi-plataforma&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, e outros, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5068,42 +5091,42 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Procurar actualizações</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Não foi possível encontrar actualizações para o Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Ocorreu o seguinte erro :</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Por favor, verifique a ligação à Internet</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<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="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Está disponível uma nova versão do Subsurface.&lt;br/&gt;Clique em:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para a descarregar.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>Está disponível uma nova versão do Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>A última versão é %1. Por favor verifique com o vendedor do sistema operativo a existência de actualizações.</translation>
</message>
@@ -5142,8 +5165,8 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Manual do utilizador</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5227,16 +5250,20 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Sistema operativo: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Arquitectura do CPU: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5276,13 +5303,6 @@ Linguagem: %1</translation>
<translation>Enviar</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-Arquitectura do CPU e SO: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Não foi possível enviar o questionário do utilizador.</translation>
@@ -5573,7 +5593,7 @@ Média</translation>
<translation>(%s) ou (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5798,12 +5818,6 @@ Média</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>autonomia</translation>
@@ -5819,6 +5833,8 @@ Média</translation>
<translation>cabeçalho</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6740,31 +6756,6 @@ EADD: %d%s
<translation>Dez</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: O sistema de ficheiros está quase cheio
-Desligue / ligue novamente o computador de mergulho
-e clique em &quot;Repetir&quot;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: sistema de ficheiros está cheio
-Desligue / ligue o computador de mergulho
-e tente novamente</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Escrita curta do ficheiro req.txt.
-O Uemis Zurich está bem ligado?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>desconhecido</translation>
@@ -6780,6 +6771,26 @@ O Uemis Zurich está bem ligado?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>Divelog #</translation>
diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts
index e4c088282..62b9558b4 100644
--- a/translations/subsurface_ro_RO.ts
+++ b/translations/subsurface_ro_RO.ts
@@ -31,22 +31,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Dată</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Timp</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Durată</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Locație</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Greutate</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -86,22 +86,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Maestru scufundare</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Companion</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notițe</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Etichete</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@ computerul de scufundări selectat?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Durată</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Adâncime</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@ computerul de scufundări selectat?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1744,7 +1744,7 @@ computerul de scufundări selectat?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"/>
</message>
@@ -1757,7 +1757,7 @@ computerul de scufundări selectat?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Timp</translation>
</message>
@@ -1792,37 +1792,37 @@ computerul de scufundări selectat?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Dată</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Durată</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Etichete</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1842,140 +1842,163 @@ computerul de scufundări selectat?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Locație</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Maestru scufundare</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Companion</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notițe</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Greutate</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"/>
</message>
@@ -2484,7 +2507,7 @@ computerul de scufundări selectat?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Descarcă</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2559,7 +2582,7 @@ computerul de scufundări selectat?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Descarcă</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2579,12 +2602,12 @@ computerul de scufundări selectat?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Selectioneaza tot</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Deselectioneaza tot</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2619,7 +2642,7 @@ computerul de scufundări selectat?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2628,17 +2651,17 @@ computerul de scufundări selectat?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3925,12 +3948,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4923,7 +4946,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>&amp;Închide</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5054,42 +5077,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5128,8 +5151,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Manual Utilizator</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5213,13 +5236,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
+Operating system: %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5259,12 +5288,6 @@ Language: %1</source>
<translation>Trimitere</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5555,7 +5578,7 @@ Medie</translation>
<translation>(%s) sau (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5780,12 +5803,6 @@ Medie</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>timp aer rămas</translation>
@@ -5801,6 +5818,8 @@ Medie</translation>
<translation>direcție</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6675,31 +6694,6 @@ EADD: %d%s
<translation>Dec</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Sistemul de Fișiere este aproape plin
-Deconectați/reconectați computerul de scufundări
-si faceți click pe „Reîncercați”</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Sistemul de Fișiere este plin
-Deconectați/reconectați computerul de scufundări
-si reîncercați</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Scriere scurtă în fișierul req.txt
-Este Uemis Zurich conectat corect?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>necunoscut</translation>
@@ -6715,6 +6709,26 @@ Este Uemis Zurich conectat corect?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 57654f12a..03d60d756 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>№</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Дата</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Время</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Длительность</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Местонахождение</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Вес</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Нач. давл.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Кон. давл.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Макс. глубина</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,42 +86,42 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Инструктор</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Партнер</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Примечания</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Метки</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Темп. воздуха</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Темп. воды</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Длительность</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Глубина</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>мин</translation>
</message>
</context>
<context>
@@ -1744,7 +1744,7 @@
<translation>Экспортировать HTML файл как</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Невозможно открыть файл %s</translation>
</message>
@@ -1757,7 +1757,7 @@
<translation>Импорт журнала погружений</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Время</translation>
</message>
@@ -1792,37 +1792,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>№</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Дата</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Длительность</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Метки</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1842,142 +1842,165 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Местонахождение</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Макс. глубина</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Сред. глубина</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Инструктор</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Партнер</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Примечания</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Вес</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Нач. давл.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Кон. давл.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Темп. воздуха</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Темп. воды</translation>
</message>
</context>
<context>
@@ -2484,7 +2507,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Загрузить</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2559,7 +2582,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Загрузить</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2579,12 +2602,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Выбрать все</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Снять выделение</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2619,7 +2642,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2628,17 +2651,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2770,7 +2793,7 @@
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Режим</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3931,12 +3954,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3957,7 +3980,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>л/мин</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4931,7 +4954,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5062,42 +5085,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Проверить обновления.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Не получилось проверить наличие обновлений.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Возникла ошибка:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Проверьте Интернет-соединение.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5136,8 +5159,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Руководство пользователя</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5221,16 +5244,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Операционная система: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-Архитектура ЦПУ: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5270,13 +5297,6 @@ Language: %1</source>
<translation>Отправить</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-ОС ЦПУ Архитектура: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Не удалось отправить опросник.</translation>
@@ -5567,7 +5587,7 @@ Maximum</source>
<translation>(%s) или (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5792,12 +5812,6 @@ Maximum</source>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>оставшееся время по воздуху</translation>
@@ -5813,6 +5827,8 @@ Maximum</source>
<translation>направление</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6717,31 +6733,6 @@ EADD: %d%s
<translation>Дек</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Файловая система почти заполнена
-Отсоедините и подключите дайв-компьютер
-и нажмите &quot;Повторить&quot;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Файловая система заполнена
-Отсоедините и подключите дайв-компьютер
-и попробуйте заново</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Прервана запись в файл req.txt
-Проверьте подключение Uemis Zurich.</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>неизвестно</translation>
@@ -6757,6 +6748,26 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 7e674be8b..0b16cc587 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Ponor #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Dátum</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Čas</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Dĺžka (min)</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Miesto</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Hmotnosť</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Počiatočný tlak</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Koncový tlak</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Max. hlbka</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,32 +86,32 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Buddy</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Poznámky</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Značky</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Teplota vzduchu</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Teplota vody</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1269,12 +1269,12 @@ vybraný počítač?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Dĺžka (min)</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Hĺbka</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1284,7 +1284,7 @@ vybraný počítač?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@ vybraný počítač?</translation>
<translation>Exportovať HTML súbor ako</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Neviem otvoriť súbor</translation>
</message>
@@ -1759,7 +1759,7 @@ vybraný počítač?</translation>
<translation>Import log súboru</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Čas</translation>
</message>
@@ -1794,37 +1794,37 @@ vybraný počítač?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Ponor #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Dátum</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Dĺžka (min)</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Značky</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1844,142 +1844,165 @@ vybraný počítač?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Miesto</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Max. hlbka</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Stredná hlbka</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Buddy</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Poznámky</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Hmotnosť</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Počiatočný tlak</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Koncový tlak</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Teplota vzduchu</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Teplota vody</translation>
</message>
</context>
<context>
@@ -2486,7 +2509,7 @@ vybraný počítač?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Stiahnutie</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@ vybraný počítač?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Stiahnutie</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2581,12 +2604,12 @@ vybraný počítač?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Vybrať všetky</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Zrušiť výber</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2621,7 +2644,7 @@ vybraný počítač?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2630,17 +2653,17 @@ vybraný počítač?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2772,7 +2795,7 @@ vybraný počítač?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Mód ponoru</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3933,12 +3956,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3959,7 +3982,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4931,7 +4954,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>&amp;Zatvoriť</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5062,42 +5085,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Kontrola novšej verzie.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface nedokázal skontrolovať existenciu novšej verzie.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Vyskytla sa nasledujúca chyba:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Prosím, skontroluj pripojenie na internet.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Používaš poslednu verziu Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Nová verzia Subsurface je k dispozícii.&lt;br/&gt;Klikni na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>K dispozícii je nová verzia Subsurface.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Najnovšia verzia je %1, over si možnosti OS updatu.</translation>
</message>
@@ -5136,8 +5159,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Užívateľská príručka</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5221,16 +5244,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-Operačný systém: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-CPU architektúra: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5270,12 +5297,6 @@ Jazyk: %1</translation>
<translation>Poslať</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>OS CPU architektúra</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface nedokázal odoslať dotazník.</translation>
@@ -5563,7 +5584,7 @@ Maximum</translation>
<translation>(%s) alebo (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5788,12 +5809,6 @@ Maximum</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>čas na vzduchu</translation>
@@ -5809,6 +5824,8 @@ Maximum</translation>
<translation>smer</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6720,31 +6737,6 @@ EADD: %d%s
<translation>Dec</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Súborovy systém takmer plný
-Odpoj/znovu pripoj počítač
-a klikni na &apos;Retry&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Súborový systém plný
-Odpoj a znovu pripoj počítač
-a skus znovu</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Čiastočný zápis do req.txt súboru
-Je Uemis Zurich korektne pripojený?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>neznámy</translation>
@@ -6760,6 +6752,26 @@ Je Uemis Zurich korektne pripojený?</translation>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>potápačský denník #</translation>
diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index d37aa0305..c936a2928 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -142,22 +142,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1745,7 +1745,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"></translation>
</message>
@@ -1758,7 +1758,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation type="unfinished"></translation>
</message>
@@ -1793,37 +1793,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"></translation>
</message>
@@ -1843,140 +1843,163 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"></translation>
</message>
@@ -2619,7 +2642,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2628,17 +2651,17 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3925,12 +3948,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -4923,7 +4946,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -5054,42 +5077,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"></translation>
</message>
@@ -5128,7 +5151,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
+ <source>User manual</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -5213,13 +5236,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
+Operating system: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -5259,12 +5288,6 @@ Language: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"></translation>
@@ -5545,7 +5568,7 @@ Maximum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5770,12 +5793,6 @@ Maximum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation type="unfinished"></translation>
@@ -5791,6 +5808,8 @@ Maximum</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation type="unfinished"></translation>
@@ -6661,38 +6680,38 @@ EADD: %d%s
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
+ <location filename="../uemis-downloader.c" line="111"/>
+ <source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
+ <location filename="../uemis-downloader.c" line="431"/>
+ <source>data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
+ <location filename="../uemis-downloader.c" line="411"/>
+ <source>%s %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="111"/>
- <source>unknown</source>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="431"/>
- <source>data</source>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="411"/>
- <source>%s %s</source>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index cd973f839..05984ed7b 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -26,37 +26,37 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Dyk #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Datum</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Tid</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Varaktighet</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Plats</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>GPS</source>
- <translation type="unfinished"/>
+ <translation>GPS</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Vikt</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -66,17 +66,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Starttryck</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Sluttryck</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Maxdjup</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,42 +86,42 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Parkamrat</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Anteckningar</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Taggar</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Vattentemperatur</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>O₂</source>
- <translation type="unfinished"/>
+ <translation>O₂</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
<source>He</source>
- <translation type="unfinished"/>
+ <translation>He</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1269,22 +1269,22 @@ radera den valda dykdatorn?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Varaktighet</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Djup</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>h:</source>
- <translation type="unfinished"/>
+ <translation>h:</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>Min</translation>
</message>
</context>
<context>
@@ -1746,7 +1746,7 @@ radera den valda dykdatorn?</translation>
<translation>Exportera HTML filer son</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>Kan inte öppna fil %s</translation>
</message>
@@ -1759,7 +1759,7 @@ radera den valda dykdatorn?</translation>
<translation>Importera dyklogg</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Tid</translation>
</message>
@@ -1794,37 +1794,37 @@ radera den valda dykdatorn?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Dyk #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Varaktighet</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Taggar</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation>O₂</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation>He</translation>
</message>
@@ -1844,142 +1844,165 @@ radera den valda dykdatorn?</translation>
<translation>Minuter:sekunder</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Plats</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Maxdjup</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>Medeldjup</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Parkamrat</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Anteckningar</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Vikt</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
- <translation type="unfinished"/>
+ <translation>Starttryck</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
- <translation type="unfinished"/>
+ <translation>Sluttryck</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Lufttemp</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Vattentemperatur</translation>
</message>
</context>
<context>
@@ -2486,7 +2509,7 @@ radera den valda dykdatorn?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Ladda ned</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2561,7 +2584,7 @@ radera den valda dykdatorn?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>Ladda ned</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2621,8 +2644,8 @@ radera den valda dykdatorn?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
- <translation>Fotouppladdningen lyckades</translation>
+ <source>Photo upload sucessfull</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="245"/>
@@ -2630,17 +2653,17 @@ radera den valda dykdatorn?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation>Fotouppladdningen misslyckades</translation>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -2772,7 +2795,7 @@ radera den valda dykdatorn?</translation>
<message>
<location filename="../qt-ui/maintab.ui" line="74"/>
<source>Dive mode</source>
- <translation type="unfinished"/>
+ <translation>Dykläge</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="102"/>
@@ -3933,12 +3956,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3959,7 +3982,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
- <translation type="unfinished"/>
+ <translation>ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@@ -4935,7 +4958,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Stäng</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-plattforms dykprogramvara&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, med fler, 2011-2015&lt;/span&gt;</translation>
</message>
@@ -5066,42 +5089,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Sök efter uppdateringar</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface kunde inte kolla efter uppdateringar.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>Följande fel inträffade:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Verifiera att du har en fungerande uppkoppling till internet.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<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="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>En ny version av Subsurface finns tillgänglig.&lt;br/&gt;Klicka på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; för att ladda ner den.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation>En ny version av Subsurface finns tillgänglig.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation>Senaste versionen är %1, vänligen kontakta din OS distributör för uppdateringar.</translation>
</message>
@@ -5140,8 +5163,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Användarmanual</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5225,14 +5248,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>Operativsystem: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>CPU Arkitektur: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5271,13 +5300,6 @@ Language: %1</source>
<translation>Skicka</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS CPU Arkitektur: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface kunde inte skicka in användarundersökningen.</translation>
@@ -5565,7 +5587,7 @@ Medel</translation>
<translation>(%s) eller (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5790,12 +5812,6 @@ Medel</translation>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>gastid</translation>
@@ -5811,6 +5827,8 @@ Medel</translation>
<translation>riktning</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6727,31 +6745,6 @@ EADD: %d%s
<translation>dec</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Filsystem är nästan fullt
-Återanslut dykdatorn och försök
-igen</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Fullt filsystem
-Återanslut dykdatorn och försök
-igen</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Kunde inte skriva filen req.txt
-Är Uemis Zurich ordentligt ansluten?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>okänd</translation>
@@ -6767,6 +6760,26 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation>%s %s</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation>dyklogg #</translation>
diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts
index d0b671c55..b4643a8c8 100644
--- a/translations/subsurface_tr.ts
+++ b/translations/subsurface_tr.ts
@@ -26,27 +26,27 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>Dalış #</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Tarih</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Zaman</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Süre</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Konum</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Ağırlık</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -76,7 +76,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>Azami derinlik</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,7 +86,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster(Dalış lideri)</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -96,22 +96,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Notlar</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>Etiketler</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Hava sıcaklığı.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Su sıcaklığı.</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@ kaldırmak istediğinizden emin misiniz?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Süre</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Derinlik</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1744,7 +1744,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
<translation>HTML dosyası olarak dışarı aktar</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>%s dosyası açılamıyor</translation>
</message>
@@ -1757,7 +1757,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
<translation>Dalış kayıt dosyalarını içe aktar</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Zaman</translation>
</message>
@@ -1792,37 +1792,37 @@ kaldırmak istediğinizden emin misiniz?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>Dalış #</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Tarih</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Süre</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>Etiketler</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1842,142 +1842,165 @@ kaldırmak istediğinizden emin misiniz?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Konum</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>Azami derinlik</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Divemaster(Dalış lideri)</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Notlar</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Ağırlık</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>Hava sıcaklığı.</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>Su sıcaklığı.</translation>
</message>
</context>
<context>
@@ -2484,7 +2507,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>İndir</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2559,7 +2582,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>İndir</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2579,12 +2602,12 @@ kaldırmak istediğinizden emin misiniz?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>Tümünü seç</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>Tümü seçimsiz</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2619,7 +2642,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2628,17 +2651,17 @@ kaldırmak istediğinizden emin misiniz?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3925,12 +3948,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4923,7 +4946,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>&amp;Kapat</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5054,42 +5077,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>Güncellemeler için denetle</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface güncellemeleri kontrol edemedi.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>Lütfen internet bağlantınızı kontrol edin.</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5128,8 +5151,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Kullanıcı Rehberi</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5213,16 +5236,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-İşletim Sistemi: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-İşlemci Mimarisi: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5262,12 +5289,6 @@ Lisan: %1</translation>
<translation>Gönder</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5557,7 +5578,7 @@ Ortalama</translation>
<translation>(%s) veya (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5782,12 +5803,6 @@ Ortalama</translation>
<translation>OLB</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>pO₂</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation type="unfinished"/>
@@ -5803,6 +5818,8 @@ Ortalama</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6688,41 +6705,41 @@ EHYD: %d%s
<translation>Aralık</translation>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="111"/>
+ <source>unknown</source>
+ <translation>bilinmeyen</translation>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="431"/>
+ <source>data</source>
+ <translation>veri</translation>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="411"/>
+ <source>%s %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
+ <source>Uemis Zurich: the file system is almost full.
Disconnect/reconnect the dive computer
and click &apos;Retry&apos;</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
+ <source>Uemis Zurich: the file system is full.
Disconnect/reconnect the dive computer
and try again</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
+ <source>Short write to req.txt file.
Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../uemis-downloader.c" line="111"/>
- <source>unknown</source>
- <translation>bilinmeyen</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="431"/>
- <source>data</source>
- <translation>veri</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="411"/>
- <source>%s %s</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index c330844a4..f24296054 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -31,22 +31,22 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Ngày tháng</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>Thời gian</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Độ dài</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>Địa điểm</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>Cân nặng</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -86,17 +86,17 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Người lặn giỏi nhất</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>Bạn</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>Ghi chú</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@ bỏ các máy lặn đã được chọn?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>Độ dài</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>Độ sâu</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@ bỏ các máy lặn đã được chọn?</translation>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>nhỏ nhất</translation>
</message>
</context>
<context>
@@ -1744,7 +1744,7 @@ bỏ các máy lặn đã được chọn?</translation>
<translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation type="unfinished"/>
</message>
@@ -1757,7 +1757,7 @@ bỏ các máy lặn đã được chọn?</translation>
<translation>Nhập dữ liệu từ tập tin ghi nhận các lần lặn</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>Thời gian</translation>
</message>
@@ -1792,37 +1792,37 @@ bỏ các máy lặn đã được chọn?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>Ngày tháng</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>Độ dài</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1842,140 +1842,163 @@ bỏ các máy lặn đã được chọn?</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Địa điểm</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>Người lặn giỏi nhất</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>Bạn</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>Ghi chú</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>Cân nặng</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
<translation type="unfinished"/>
</message>
@@ -2618,7 +2641,7 @@ bỏ các máy lặn đã được chọn?</translation>
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2627,17 +2650,17 @@ bỏ các máy lặn đã được chọn?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3924,12 +3947,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4922,7 +4945,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5053,42 +5076,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5127,8 +5150,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>Hướng dẫn sử dụng</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5212,13 +5235,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
+Operating system: %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5258,12 +5287,6 @@ Language: %1</source>
<translation>Gửi</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation type="unfinished"/>
@@ -5544,7 +5567,7 @@ Maximum</source>
<translation>(%s) hoặc (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5769,12 +5792,6 @@ Maximum</source>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>thời gian không khí</translation>
@@ -5790,6 +5807,8 @@ Maximum</source>
<translation>thẳng tiến</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation type="unfinished"/>
@@ -6663,31 +6682,6 @@ EADD: %d%s
<translation>Th12</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: Hệ thống tập tin đã quá tải
-Ngắt kết nối/kết nối lại thiết bị đo lặn
-và click &apos;Thử lại&apos;</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: Hệ thống tập tin quá tải
-Ngắt kết nối/kết nối lại thiết bị đo lặn
-và thử lại lần nữa</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>Ghi ngắn gọn vào tập tin req.txt
-Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>chưa rõ</translation>
@@ -6703,6 +6697,26 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index bc9f20da7..8356cf628 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -26,27 +26,27 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Dive #</source>
- <translation type="unfinished"/>
+ <translation>潛水號#</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>日期</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Time</source>
- <translation type="unfinished"/>
+ <translation>時間</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>區間</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
- <translation type="unfinished"/>
+ <translation>位置</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -56,7 +56,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Weight</source>
- <translation type="unfinished"/>
+ <translation>重量</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@@ -76,7 +76,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Max depth</source>
- <translation type="unfinished"/>
+ <translation>最大深度</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
@@ -86,32 +86,32 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>導潛</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Buddy</source>
- <translation type="unfinished"/>
+ <translation>潛伴</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Notes</source>
- <translation type="unfinished"/>
+ <translation>記錄</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Tags</source>
- <translation type="unfinished"/>
+ <translation>標籤</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>氣溫</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>水溫</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
@@ -140,22 +140,22 @@
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample po2</source>
+ <source>Sample pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample cns</source>
+ <source>Sample CNS</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
- <source>Sample ndl</source>
+ <source>Sample NDL</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
- <source>Sample tts</source>
+ <source>Sample TTS</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1267,12 +1267,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
<source>Duration</source>
- <translation type="unfinished"/>
+ <translation>區間</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
<source>Depth</source>
- <translation type="unfinished"/>
+ <translation>深度</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
@@ -1282,7 +1282,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
<source>min</source>
- <translation type="unfinished"/>
+ <translation>min</translation>
</message>
</context>
<context>
@@ -1744,7 +1744,7 @@
<translation>匯出 HTML 檔案為</translation>
</message>
<message>
- <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
+ <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
<source>Can&apos;t open file %s</source>
<translation>無法開啟檔案 %s</translation>
</message>
@@ -1757,7 +1757,7 @@
<translation>載入潛水檔案</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
<source>Time</source>
<translation>時間</translation>
</message>
@@ -1792,37 +1792,37 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
<source>Dive #</source>
<translation>潛水號#</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
<source>Date</source>
<translation>日期</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
<source>Duration</source>
<translation>區間</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
<source>GPS</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
<source>Tags</source>
<translation>標籤</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
<source>O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
<source>He</source>
<translation type="unfinished"/>
</message>
@@ -1842,142 +1842,165 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>位置</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
<source>Max depth</source>
<translation>最大深度</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
<source>Tab</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
<source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
<source>Sample time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
<source>Sample depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
<source>Sample temperature</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
- <source>Sample po2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
<source>Sample cns</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
<source>Sample ndl</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
<source>Sample tts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
<source>Sample stopdepth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+ <source>Sample pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
+ <source>Sample CNS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
+ <source>Sample NDL</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
+ <source>Sample TTS</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
<source>Samples pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
<source>Sample pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
<source>Mean depth</source>
<translation>平均深度</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
<source>Divemaster</source>
- <translation type="unfinished"/>
+ <translation>導潛</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
<source>Buddy</source>
<translation>潛伴</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
<source>Notes</source>
<translation>記錄</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
<source>Weight</source>
<translation>重量</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
<source>Cyl. size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
<source>Start pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
<source>End pressure</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
<source>Air temp.</source>
- <translation type="unfinished"/>
+ <translation>氣溫</translation>
</message>
<message>
- <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+ <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
<source>Water temp.</source>
- <translation type="unfinished"/>
+ <translation>水溫</translation>
</message>
</context>
<context>
@@ -2484,7 +2507,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>下載</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
@@ -2559,7 +2582,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
<source>Download</source>
- <translation type="unfinished"/>
+ <translation>下載</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
@@ -2579,12 +2602,12 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
<source>Select all</source>
- <translation type="unfinished"/>
+ <translation>選擇全部</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
<source>Unselect all</source>
- <translation type="unfinished"/>
+ <translation>取消選擇全部</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
@@ -2619,7 +2642,7 @@
<name>FacebookManager</name>
<message>
<location filename="../qt-ui/socialnetworks.cpp" line="244"/>
- <source>Photo Upload Sucessfull</source>
+ <source>Photo upload sucessfull</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2628,17 +2651,17 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+ <source>Photo upload failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-ui/socialnetworks.cpp" line="250"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
- <source>Photo Upload Failed</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>FilterWidget</name>
@@ -3931,12 +3954,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
- <source>CCR: Show setpoints when viewing pO₂</source>
+ <source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
- <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+ <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4929,7 +4952,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>關閉</translation>
</message>
<message>
- <location filename="../qt-ui/about.cpp" line="13"/>
+ <location filename="../qt-ui/about.cpp" line="16"/>
<source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
<translation type="unfinished"/>
</message>
@@ -5060,42 +5083,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>UpdateManager</name>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="64"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="63"/>
<source>Check for updates.</source>
<translation>檢查有無更新。</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="64"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Subsurface 無法確認更新。</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="70"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="69"/>
<source>The following error occurred:</source>
<translation>錯誤持續發生:</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="70"/>
<source>Please check your internet connection.</source>
<translation>請確認您的網路連線。</translation>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="83"/>
<source>You are using the latest version of Subsurface.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="86"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="95"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="94"/>
<source>A new version of Subsurface is available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+ <location filename="../qt-ui/updatemanager.cpp" line="95"/>
<source>Latest version is %1, please check with your OS vendor for updates.</source>
<translation type="unfinished"/>
</message>
@@ -5134,8 +5157,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<name>UserManual</name>
<message>
<location filename="../qt-ui/usermanual.cpp" line="54"/>
- <source>User Manual</source>
- <translation>使用者說明</translation>
+ <source>User manual</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usermanual.cpp" line="71"/>
@@ -5219,16 +5242,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/usersurvey.cpp" line="41"/>
<source>
-Operating System: %1</source>
- <translation>
-作業系統: %1</translation>
+Operating system: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="43"/>
<source>
-CPU Architecture: %1</source>
- <translation>
-CPU 架構: %1</translation>
+CPU architecture: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+ <source>
+OS CPU architecture: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-ui/usersurvey.cpp" line="46"/>
@@ -5268,13 +5295,6 @@ Language: %1</source>
<translation>傳送</translation>
</message>
<message>
- <location filename="../qt-ui/usersurvey.cpp" line="45"/>
- <source>
-OS CPU Architecture: %1</source>
- <translation>
-OS CPU 架構: %1</translation>
- </message>
- <message>
<location filename="../qt-ui/usersurvey.cpp" line="116"/>
<source>Subsurface was unable to submit the user survey.</source>
<translation>Subsurface 無法傳送使用者調查</translation>
@@ -5565,7 +5585,7 @@ Maximum</source>
<translation>(%s) 或 (%s)</translation>
</message>
<message>
- <location filename="../divelist.c" line="467"/>
+ <location filename="../divelist.c" line="468"/>
<location filename="../equipment.c" line="81"/>
<location filename="../planner.c" line="1081"/>
<location filename="../planner.c" line="1084"/>
@@ -5790,12 +5810,6 @@ Maximum</source>
<translation>OLF</translation>
</message>
<message>
- <location filename="../cochran.c" line="354"/>
- <location filename="../cochran.c" line="400"/>
- <source>PO2</source>
- <translation>PO2</translation>
- </message>
- <message>
<location filename="../libdivecomputer.c" line="124"/>
<source>airtime</source>
<translation>空氣時間</translation>
@@ -5811,6 +5825,8 @@ Maximum</source>
<translation>標題</translation>
</message>
<message>
+ <location filename="../cochran.c" line="354"/>
+ <location filename="../cochran.c" line="400"/>
<location filename="../libdivecomputer.c" line="124"/>
<source>pO₂</source>
<translation>pO₂</translation>
@@ -6708,31 +6724,6 @@ EADD: %d%s
<translation>12月</translation>
</message>
<message>
- <location filename="../uemis-downloader.c" line="24"/>
- <source>Uemis Zurich: File System is almost full
-Disconnect/reconnect the dive computer
-and click &apos;Retry&apos;</source>
- <translation>Uemis Zurich: 檔案系統使用空間已接近額滿
-請將潛水電腦中斷/重新連接
-並按下&quot;重試&quot;鈕</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="25"/>
- <source>Uemis Zurich: File System is full
-Disconnect/reconnect the dive computer
-and try again</source>
- <translation>Uemis Zurich: 檔案系統使用空間已額滿
-請將潛水電腦中斷/重新連接
-並再次嘗試</translation>
- </message>
- <message>
- <location filename="../uemis-downloader.c" line="26"/>
- <source>Short write to req.txt file
-Is the Uemis Zurich plugged in correctly?</source>
- <translation>無法寫入 req.txt 檔案
-請確認 Uemis Zurich 是否正確連接?</translation>
- </message>
- <message>
<location filename="../uemis-downloader.c" line="111"/>
<source>unknown</source>
<translation>未知</translation>
@@ -6748,6 +6739,26 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../uemis-downloader.c" line="24"/>
+ <source>Uemis Zurich: the file system is almost full.
+Disconnect/reconnect the dive computer
+and click &apos;Retry&apos;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="25"/>
+ <source>Uemis Zurich: the file system is full.
+Disconnect/reconnect the dive computer
+and try again</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../uemis-downloader.c" line="26"/>
+ <source>Short write to req.txt file.
+Is the Uemis Zurich plugged in correctly?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../uemis-downloader.c" line="452"/>
<source>divelog #</source>
<translation type="unfinished"/>