[PATCH 1/2] Update translation files
subsurface at henrik.synth.no
subsurface at henrik.synth.no
Mon Nov 12 01:30:06 PST 2012
From: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>
Updated the translation files after the latest changes. No edits
have been made just "make update-po-files".
Signed-off-by: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>
---
po/bg_BG.po | 523 ++++++++++++++++++++++++++++++++++--------------------------
po/de_CH.po | 520 +++++++++++++++++++++++++++++++++--------------------------
po/de_DE.po | 520 +++++++++++++++++++++++++++++++++--------------------------
po/es_ES.po | 523 ++++++++++++++++++++++++++++++++++--------------------------
po/fi_FI.po | 520 +++++++++++++++++++++++++++++++++--------------------------
po/fr_FR.po | 498 ++++++++++++++++++++++++++++++++-------------------------
po/hr_HR.po | 519 +++++++++++++++++++++++++++++++++--------------------------
po/it_IT.po | 519 +++++++++++++++++++++++++++++++++--------------------------
po/nb_NO.po | 520 +++++++++++++++++++++++++++++++++--------------------------
po/nl_NL.po | 520 +++++++++++++++++++++++++++++++++--------------------------
po/sk_SK.po | 520 +++++++++++++++++++++++++++++++++--------------------------
po/sv_SE.po | 519 +++++++++++++++++++++++++++++++++--------------------------
12 files changed, 3531 insertions(+), 2690 deletions(-)
diff --git a/po/bg_BG.po b/po/bg_BG.po
index f8f7d6c..379fbc9 100644
--- a/po/bg_BG.po
+++ b/po/bg_BG.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-11-10 16:27+0300\n"
"Last-Translator: Lubomir I. Ivanov <neolit123 at gmail.com>>\n"
"Language-Team: Bulgarian\n"
@@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Месец"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Моля изберете леководолазен компютър и устройство. "
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "№"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/мин"
@@ -44,59 +44,82 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s, %3$s, %2$s, %4$d, %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s %3$d %2$s %4$d %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s, %3$d %2$s, %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s, %3$d %2$s, %4$d %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d мин"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dд %dч %dмин"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dч %dмин"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) или (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "За Subsurface"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Добави Гмуркане..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Добави гмуркане"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Добави в горно пътуване"
+# ППК = Повърхностно Потребление на Кислород
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Средна Темп."
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "Апр"
@@ -105,88 +128,88 @@ msgstr "Апр"
msgid "Aug"
msgstr "Авг"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Автоматично групиране"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Автоматично групиране на гмуркания в пътувания"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Средно"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Средно"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Средно"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Средно"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Средна Дълбочина"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Средно ППК"
# ППК = Повърхностно Потребление на Кислород
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Средна Темп."
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Средно Време"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "Бара"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Партньор"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Целзии"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Моля Изберете XML Файл По Подразбиране"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Моля Изберете XML Файлове За Вмъкване"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Затвори"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Свиване на всички"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Създай ново пътуване"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "Кб.Фута"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Бут."
@@ -198,15 +221,15 @@ msgstr "Бутилка"
msgid "Cylinders"
msgstr "Бутилки"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Дата"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Дата и Час"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Дата:"
@@ -214,46 +237,38 @@ msgstr "Дата:"
msgid "Dec"
msgstr "Дек"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "XML Файл По Подразибране"
-#: info.c:256
-msgid "Delete"
-msgstr "Изтрий"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Изтрий Гмуркане"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Изтрий гмуркане"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Изтрий гмуркания"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Дълбочина"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Дълбочина (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Надминат Лимит На Дълбочина"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Дълбочина:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Име на устройство"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -267,106 +282,107 @@ msgid "Dive #%d - "
msgstr "Гмуркане №%d - "
#: libdivecomputer.c:254
+#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Гмуркане №%d: %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Информация"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Бележки"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Време"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Тревога: Време за Гмуркане"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Времева Информация за Гмуркане"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Леководолазен Компютър"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Грешка при вход на данни"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Информяция за гмуркане"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Водач"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Гмуркане №"
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Шрифт за Списъка на Гмуркания"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Водач"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Гмуркания"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Изтегли от Леководолазен Компютър"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Изтегли от Леководолазен Компютър..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Продълж. (мин.)"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Продълж. (мин.)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Редактирай"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Редактиране на информация за пътуване"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Редактиране на обобщение за пътуване"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Редактиране на гмуркане"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Редактирай гмуркания"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Редактиране на гмуркания"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Редактиране на обобщение за пътуване"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Включване / Изключване на Събития"
@@ -374,10 +390,15 @@ msgstr "Включване / Изключване на Събития"
msgid "End"
msgstr "Край"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Екипировка"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Грешка при рaзряд на стойности"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Грешка при разряд на дата и час"
@@ -386,7 +407,7 @@ msgstr "Грешка при разряд на дата и час"
msgid "Error parsing the divetime"
msgstr "Грешка при рaзряд на време за гмуркане"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Грешка при рaзряд на газ микс"
@@ -398,11 +419,11 @@ msgstr "Грешка при рaзряд на газ микс брой"
msgid "Error parsing the maxdepth"
msgstr "Грешка при рaзряд на максимална дълбочина"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Грешка при рaзряд на стойности"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Грешка при регистриране на направление за отменяне"
@@ -410,48 +431,48 @@ msgstr "Грешка при регистриране на направление
msgid "Error registering the data"
msgstr "Грешка при регистриране на данни"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Грешка при регистриране на направление за събития"
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Събитие: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Събитие: изчаквание на действие от потребителя"
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Разшири всички"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Фаренхайт"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Не могат да бъдат отворени %i файла"
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Не може да бъде напревен разбор на '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Не може да бъде напревен разбор на '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Не може да бъде прочетен '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Не може да бъде прочетен '%s'.\n"
@@ -460,23 +481,27 @@ msgstr "Не може да бъде прочетен '%s'.\n"
msgid "Feb"
msgstr "Фев"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "Фута"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Файл"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Филтър"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Пет"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Използван Газ"
@@ -484,15 +509,19 @@ msgstr "Използван Газ"
msgid "Gasmix"
msgstr "Газ Микс"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Помощ"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Вмъкване на XML файл(ове)..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Информация"
@@ -509,40 +538,40 @@ msgstr "Юли"
msgid "Jun"
msgstr "Юни"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Линус Торвалдс, Дирк Хондел и други, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Списък"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "Литра"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Местоположение"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Регистър"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Най-дълго"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Най-дълго Гмуркане"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Тревога: Слаба Батерия"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Внимание: Слаба Батерия"
@@ -550,31 +579,31 @@ msgstr "Внимание: Слаба Батерия"
msgid "Mar"
msgstr "Март"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Маркер"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Главен"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Внимание: Максимално Време на Сигнал за Декомпресия"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Макс. Дълбочина"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Макс. ППК"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Макс. Темп."
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -589,17 +618,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Макс. Налягане"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Максимум"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Максимум"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Максимум"
@@ -608,46 +637,51 @@ msgstr "Максимум"
msgid "May"
msgstr "Май"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Изтрий гмуркания"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Слей пътуване с горно пътуване"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Слей пътуване с долно пътуване"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "Метра"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Мин. Дълбочина"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Мин. ППК"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Мин. Темп."
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Минимум"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Минимум"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Минимум"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Общи Настройки"
@@ -655,23 +689,23 @@ msgstr "Общи Настройки"
msgid "Mon"
msgstr "Пон"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Мултиплатформен, гмуркачески регистър-софтуер написан на C"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Нов"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Нов стартов номер"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Няма Информация за Резервоар"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Бележки"
@@ -684,7 +718,7 @@ msgid "OLF"
msgstr "OLF"
# АЗПК = Апарат за Поносимост на Кислород
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "АЗПК"
@@ -692,15 +726,15 @@ msgstr "АЗПК"
msgid "Oct"
msgstr "Окт"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Грешка върната от phread"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Отвори Файл"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Отвори..."
@@ -708,27 +742,27 @@ msgstr "Отвори..."
msgid "PO2"
msgstr "PO2"
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Тревога: Покачване на Парциално О2 Налягане"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Внимание: Покачване на Парциално О2 Налягане"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Внимание: Парциално О2 Налягане в Зелената Зона"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Настройки"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Настройки..."
@@ -736,80 +770,76 @@ msgstr "Настройки..."
msgid "Pressure"
msgstr "Налягане"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Налягане:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Красив печат"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Напечатай само избраните гмуркания"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Напечатай селекцията"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Тип на печата"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Напечатай..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Профил"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Изход"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Тревога: Оставащо Газ-Време"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Внимание: Оставащо Газ-Време"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Оценка"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Четене на гмуркане %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Изтрий Пътуване"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Изтрий гмуркане от пътуване"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Изтрий избраните гмуркания от пътуване"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Преномерирай"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Преномерирай..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Опитай пак"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "ППК"
@@ -817,7 +847,7 @@ msgstr "ППК"
msgid "SDE file"
msgstr "SDE файл"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Нарушение на Безопасно Спиране"
@@ -825,28 +855,30 @@ msgstr "Нарушение на Безопасно Спиране"
msgid "Sat"
msgstr "Съб"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Запиши като..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Запиши Промените?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Запиши Файл Като?"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Запиши..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Избери Събития"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Избери Събития..."
#: main.c:47
@@ -861,28 +893,32 @@ msgstr ""
"Кратък запис в req.txt файл\n"
"Uemis Zurich включен ли е правилно?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Най-къс"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Най-кратко Гмуркане"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Покажи Колони"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Големина"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Тревога: Скорост"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Внимание: Скорост"
@@ -890,15 +926,15 @@ msgstr "Внимание: Скорост"
msgid "Start"
msgstr "Старт"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Статистика"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Статистики"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Водолазен Костюм"
@@ -907,35 +943,39 @@ msgstr "Водолазен Костюм"
msgid "Sun"
msgstr "Нед"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Време на Повърхността"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Печат на таблица"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Предложение за Смяна на Резорвоар"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Информация: Налагане на Резервоар"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Температура"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Температура:"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Температура:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Комбиниран"
@@ -943,25 +983,25 @@ msgstr "Комбиниран"
msgid "Thu"
msgstr "Чет"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Време"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Превключване на Зуум"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Общо Време"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Общо Време"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -996,11 +1036,11 @@ msgstr ""
"Излючете/Свържете на ново леководолазния компютър\n"
"и опитайте пак"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Uemis не може да бъде зареден"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "Не може да бъде създаден libdivecomputer контекст"
@@ -1009,23 +1049,28 @@ msgstr "Не може да бъде създаден libdivecomputer конте
msgid "Unable to create parser for %s %s"
msgstr "Не може да бъде създаден разряд за %s %s"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
+#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Не може да бъдe отворен %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Единици"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Изглед"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Обем:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Темп. на Водата"
@@ -1033,7 +1078,7 @@ msgstr "Темп. на Водата"
msgid "Wed"
msgstr "Ср"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Тежест"
@@ -1041,23 +1086,23 @@ msgstr "Тежест"
msgid "Weight System"
msgstr "Система за тежест"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Тегло:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML файл"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Година"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Годишни статистики"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1065,7 +1110,7 @@ msgstr ""
"Имате незаписани промени.\n"
"Желаете ли да ги запишете преди затваряне на файла?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1074,7 +1119,7 @@ msgstr ""
"Имате незаписани промени във файла %s.\n"
"Желаете ли да ги запишете преди затваряне на файла?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "въздух"
@@ -1106,7 +1151,7 @@ msgstr "колан"
msgid "bookmark"
msgstr "бележка"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "таван"
@@ -1122,7 +1167,7 @@ msgstr "щипка"
msgid "cuft"
msgstr "кб.фута"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "декомпресия"
@@ -1134,7 +1179,7 @@ msgstr "дълбочина на спиране"
msgid "divetime"
msgstr "време за гмуркане"
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "фута"
@@ -1154,7 +1199,7 @@ msgstr "вградена"
msgid "invalid event number"
msgstr "грешен номер на събитие"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "кг"
@@ -1162,11 +1207,11 @@ msgstr "кг"
msgid "l"
msgstr "л"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "паунда"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "м"
@@ -1174,16 +1219,16 @@ msgstr "м"
msgid "maxdepth"
msgstr "Макс. Дълбочина"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "мин"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "повече от %d дни"
@@ -1192,6 +1237,22 @@ msgstr "повече от %d дни"
msgid "none"
msgstr "няма"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "паскала"
@@ -1229,7 +1290,7 @@ msgid "tissue level warning"
msgstr "внимание: ниво на тъканта"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr "Lubomir I. Ivanov"
@@ -1241,7 +1302,7 @@ msgstr "предавател"
msgid "unkn"
msgstr "неизв."
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "неизвестно"
@@ -1264,6 +1325,12 @@ msgstr "натовареност"
#~ msgid "About"
#~ msgstr "Информация"
+#~ msgid "Delete"
+#~ msgstr "Изтрий"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Изтрий Гмуркане"
+
#, fuzzy
#~ msgctxt "Depth"
#~ msgid ""
@@ -1273,6 +1340,9 @@ msgstr "натовареност"
#~ "Дълбочина\n"
#~ "Средна"
+#~ msgid "Device name"
+#~ msgstr "Име на устройство"
+
#, fuzzy
#~ msgctxt "Duration"
#~ msgid ""
@@ -1282,6 +1352,9 @@ msgstr "натовареност"
#~ "Продължителност\n"
#~ "Тотално"
+#~ msgid "Pretty print"
+#~ msgstr "Красив печат"
+
#, fuzzy
#~ msgctxt "SAC"
#~ msgid ""
diff --git a/po/de_CH.po b/po/de_CH.po
index 226fc32..287bac5 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-22 17:37+0100\n"
"Last-Translator: Martin Gysel <me at bearsh.org>\n"
"Language-Team: German\n"
@@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Monat"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Bitte Tauchcomputer und Gerät auswählen. "
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "#"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -44,59 +44,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s %4$d. %3$s %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) oder (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "Info zu Subsurface"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Tauchgang hinzufügen..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Tauchgang hinzufügen"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Zur obigen Reise hinzufügen"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Durchschn. Temp"
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "Apr"
@@ -105,89 +127,89 @@ msgstr "Apr"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Automatisch gruppieren"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Automatisch die Tauchgänge gruppieren"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Ø"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Ø"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Ø"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Durchschn. Tiefe"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Ø SAC"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Durchschn. Temp"
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Duchschn. Dauer"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Partner"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Standard XML Datei auswählen"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr ""
"Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werden "
"sollen"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Schliessen"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Alle einfalten"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Neue Reise darüber einfügen"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Tank"
@@ -199,15 +221,15 @@ msgstr "Tank"
msgid "Cylinders"
msgstr "Tanks"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Datum"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Datum und Zeit"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Datum:"
@@ -215,46 +237,38 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Dez"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Standard XML Datei"
-#: info.c:256
-msgid "Delete"
-msgstr "Löschen"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Tauchgang löschen"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Tauchgang löschen"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Tauchgänge löschen"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Tiefe"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Tiefe (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Tiefenlimit überschritten"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Tiefe:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Gerätename"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -272,103 +286,103 @@ msgstr "Tauchgang #%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Tauchgang Nr. %d: %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Informationen"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Notizen"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Dauer"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Alarm: Tauchgangsdauer"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Info: Tauchgangsdauer"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Tauchcomputer"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Fehler beim Importieren der Daten des Tauchgangs"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Notizen zum Tauchgang"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Dive guide"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Tauchgang Nr."
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Schriftart für Tauchliste"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Diveguide"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Tauchgänge"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Von Tauchcomputer "
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Von Tauchcomputer laden..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Dauer"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Dauer (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Bearbeiten"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Reisen-Informationen bearbeiten"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Reisen-Übersicht bearbeiten"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Tauchgang bearbeiten"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Tauchgänge bearbeiten"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Mehrere Tauchgänge bearbeiten"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Reisen-Übersicht bearbeiten"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Ereignisse Ein-/Ausblenden"
@@ -376,10 +390,15 @@ msgstr "Ereignisse Ein-/Ausblenden"
msgid "End"
msgstr "Ende"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Ausrüstung"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Fehler beim Auswerten der Samples"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Fehler beim Analysieren des Datums"
@@ -388,7 +407,7 @@ msgstr "Fehler beim Analysieren des Datums"
msgid "Error parsing the divetime"
msgstr "Fehler beim Analysieren der Dauer"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Fehler beim Analysieren der Gas Informationen"
@@ -400,11 +419,11 @@ msgstr "Fehler beim Analysieren der Gas Informationen"
msgid "Error parsing the maxdepth"
msgstr "Fehler beim Analysieren der maximalen Tiefe"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Fehler beim Auswerten der Samples"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Fehler bei der Registrierung der Abbruchbehandlung"
@@ -412,48 +431,48 @@ msgstr "Fehler bei der Registrierung der Abbruchbehandlung"
msgid "Error registering the data"
msgstr "Fehler beim Registrieren der Daten"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Fehler beim Registrieren der Ereignisbehandlung"
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Ereignis: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Ereignis: warte auf Benutzer Aktion"
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Alle ausfalten"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Fehler beim Öffnen von %i Dateien."
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Fehler beim Analysieren von '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Fehler beim Analysieren von '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Fehler beim Lesen von '%s'.\n"
@@ -462,23 +481,27 @@ msgstr "Fehler beim Lesen von '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "Fuss"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Datei"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filter"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Fr"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Gasverbrauch"
@@ -486,15 +509,19 @@ msgstr "Gasverbrauch"
msgid "Gasmix"
msgstr "Gasmischung"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Hilfe"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "XML Datei(en) einlesen..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Informationen"
@@ -511,40 +538,40 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "Liter"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Ort"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Log"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Max."
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Längster Tauchgang"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Alarm: Batterie schwach"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Warnung: Batterie schwach"
@@ -552,31 +579,31 @@ msgstr "Warnung: Batterie schwach"
msgid "Mar"
msgstr "Mär"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Markierung"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Guide"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Warnung: Maximale Deco Zeit"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Max. Tiefe"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Max. SAC"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -591,17 +618,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Max. Druck"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Max."
@@ -610,46 +637,51 @@ msgstr "Max."
msgid "May"
msgstr "Mai"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Tauchgänge löschen"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Reise mit der darüber verbinden"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Reise mit der darunter verbinden"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "Meter"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Min. Tiefe"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Min. Temp."
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Verschiedene Optionen"
@@ -657,23 +689,23 @@ msgstr "Verschiedene Optionen"
msgid "Mon"
msgstr "Mo"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Multi-Platform Tauchprogram in C"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Neu"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Neue erste Nummer"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Keine Tank Informationen"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Notizen"
@@ -685,7 +717,7 @@ msgstr "Nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -693,15 +725,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Unbekannter pthread Fehlercode"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Datei öffnen"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Öffnen..."
@@ -709,27 +741,27 @@ msgstr "Öffnen..."
msgid "PO2"
msgstr "PO₂"
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Alarm: Aufstieg / PO₂"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Warnung: Aufstieg / PO₂"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Warnung: PO₂ Grün"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Einstellungen"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Einstellungen..."
@@ -737,80 +769,76 @@ msgstr "Einstellungen..."
msgid "Pressure"
msgstr "Druck"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Druck:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Schön drucken"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Nur ausgewählte Tauchgänge drucken"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Auswahl drucken"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Art des Ausdrucks"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Drucken..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Beenden"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Alarm: verbleibende Gas-Zeit"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Warnung: verbleibende Gas-Zeit"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Bewertung"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Lese Tauchgang %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Reise entfernen"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Tauchgang aus Reise entfernen"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Neu nummerieren"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Neu nummerieren..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Wiederholen"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "SAC"
@@ -818,7 +846,7 @@ msgstr "SAC"
msgid "SDE file"
msgstr "SDE Datei"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Verletzung des Sicherheitsstops"
@@ -826,28 +854,30 @@ msgstr "Verletzung des Sicherheitsstops"
msgid "Sat"
msgstr "Sa"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Speichern unter..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Änderungen speichern?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Datei speichern unter"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Speichern..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Ereignisse auswählen"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Ereignisse auswählen..."
#: main.c:47
@@ -862,28 +892,32 @@ msgstr ""
"Unvollständiger Schreibvorgang der req.txt Datei\n"
"Ist der Uemis Zurich korrekt verbunden?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Kürzester Tauchgang"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Spalten anzeigen"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Grösse"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarm: Geschwindigkeit"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Warnung: Geschwindigkeit"
@@ -891,15 +925,15 @@ msgstr "Warnung: Geschwindigkeit"
msgid "Start"
msgstr "Start"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Statistiken"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Statistiken"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Anzug"
@@ -908,35 +942,39 @@ msgstr "Anzug"
msgid "Sun"
msgstr "So"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Oberflächenpause"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Tabellenausdruck"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Tankwechsel Vorschlag"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Info: Tankdruck"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temperatur"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Temperatur:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Drei"
@@ -944,25 +982,25 @@ msgstr "Drei"
msgid "Thu"
msgstr "Do"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Zeit"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Zoom ein-/ausschalten"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Gesamt"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Gesamtzeit"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -997,11 +1035,11 @@ msgstr ""
"Bitte den Tauchcomputer ausstecken und wieder einstecken\n"
"und erneut versuchen"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Uemis Initialisierung fehlgeschlagen"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "Fehler beim Erzeugen des libdivecomputer Contexts"
@@ -1010,24 +1048,28 @@ msgstr "Fehler beim Erzeugen des libdivecomputer Contexts"
msgid "Unable to create parser for %s %s"
msgstr "Nicht in der Lage, einen Parser für %s %s zu erstellen"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Fehler beim Öffnen von %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Einheiten"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Ansicht"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Volumen:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Wassertemperatur"
@@ -1035,7 +1077,7 @@ msgstr "Wassertemperatur"
msgid "Wed"
msgstr "Mi"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Gewicht"
@@ -1043,23 +1085,23 @@ msgstr "Gewicht"
msgid "Weight System"
msgstr "Gewicht"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Gewicht:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML Datei"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Jahr"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Jährliche Statistiken"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1067,7 +1109,7 @@ msgstr ""
"Nicht alle Änderungen wurden gespeichert.\n"
"Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1076,7 +1118,7 @@ msgstr ""
"Nicht alle Änderungen in der Datei %s wurden gespeichert.\n"
"Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "Luft"
@@ -1108,7 +1150,7 @@ msgstr "Gürtel"
msgid "bookmark"
msgstr "Markierung"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "Minimaltiefe"
@@ -1124,7 +1166,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "cuft"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "Deko"
@@ -1136,7 +1178,7 @@ msgstr "Tiefenstopp"
msgid "divetime"
msgstr "Dauer"
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1156,7 +1198,7 @@ msgstr "integriert"
msgid "invalid event number"
msgstr "ungültige Ereignisnummer"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1164,11 +1206,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "US Pfund"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1176,16 +1218,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "Max. Tiefe"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "mehr als %d Tage"
@@ -1194,6 +1236,22 @@ msgstr "mehr als %d Tage"
msgid "none"
msgstr "keine"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "Pascal"
@@ -1231,7 +1289,7 @@ msgid "tissue level warning"
msgstr "Warnung auf Gewebe-Ebene"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr ""
"Dirk Hohndel\n"
@@ -1245,7 +1303,7 @@ msgstr "Sender"
msgid "unkn"
msgstr "unbk"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "unbekannt"
@@ -1268,6 +1326,12 @@ msgstr "Arbeit"
#~ msgid "About"
#~ msgstr "Info"
+#~ msgid "Delete"
+#~ msgstr "Löschen"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Tauchgang löschen"
+
#~ msgctxt "Depth"
#~ msgid ""
#~ "Depth\n"
@@ -1276,6 +1340,9 @@ msgstr "Arbeit"
#~ "Tiefe\n"
#~ "Ø"
+#~ msgid "Device name"
+#~ msgstr "Gerätename"
+
#~ msgctxt "Duration"
#~ msgid ""
#~ "Duration\n"
@@ -1284,6 +1351,9 @@ msgstr "Arbeit"
#~ "Dauer\n"
#~ "Gesamt"
+#~ msgid "Pretty print"
+#~ msgstr "Schön drucken"
+
#~ msgctxt "SAC"
#~ msgid ""
#~ "SAC\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index 71cbe6f..3503d64 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-10 16:27+0900\n"
"Last-Translator: Dirk Hohndel <dirk at hohndel.org>\n"
"Language-Team: German\n"
@@ -18,20 +18,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Monat"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Bitte Tauchcomputer und Gerät auswählen. "
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "Nr."
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -43,59 +43,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s %4$d. %3$s %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) oder (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "Info zu Subsurface"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Tauchgang hinzufügen..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Tauchgang hinzufügen"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Zur obigen Reise hinzufügen"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Ø Temp"
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "Apr"
@@ -104,89 +126,89 @@ msgstr "Apr"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Automatisch gruppieren"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Automatisch die Tauchgänge gruppieren"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Ø"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Ø"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Ø"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Ø Tiefe"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Ø AMV"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Ø Temp"
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Ø Dauer"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Partner"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Standard XML Datei auswählen"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr ""
"Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werden "
"sollen"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Schließen"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Alle einfalten"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Neue Reise darüber einfügen"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Flasche"
@@ -198,15 +220,15 @@ msgstr "Flasche"
msgid "Cylinders"
msgstr "Flaschen"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Datum"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Datum und Zeit"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Datum:"
@@ -214,46 +236,38 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Dez"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Standard XML Datei"
-#: info.c:256
-msgid "Delete"
-msgstr "Löschen"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Tauchgang löschen"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Tauchgang löschen"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Tauchgänge löschen"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Tiefe"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Tiefe (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Tiefenbegrenzung überschritten"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Tiefe:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Gerätename"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -271,103 +285,103 @@ msgstr "Tauchgang #%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Tauchgang Nr. %d: %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Informationen"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Notizen"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Dauer"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Alarm: Tauchgangsdauer"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Info: Tauchgangsdauer"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Tauchcomputer"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Fehler beim Importieren der Daten des Tauchgangs"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Notizen zum Tauchgang"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Tauchgruppenleiter"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Tauchgang Nr."
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Schriftart für Tauchliste"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Tauchgruppenleiter"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Tauchgänge"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Von Tauchcomputer laden"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Von Tauchcomputer laden..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Dauer"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Dauer (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Bearbeiten"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Reisen-Informationen bearbeiten"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Reisen-Übersicht bearbeiten"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Tauchgang bearbeiten"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Tauchgänge bearbeiten"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Mehrere Tauchgänge bearbeiten"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Reisen-Übersicht bearbeiten"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Ereignisse Ein-/Ausblenden"
@@ -375,10 +389,15 @@ msgstr "Ereignisse Ein-/Ausblenden"
msgid "End"
msgstr "Ende"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Ausrüstung"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Fehler beim Auswerten der Samples"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Fehler beim Analysieren des Datums"
@@ -387,7 +406,7 @@ msgstr "Fehler beim Analysieren des Datums"
msgid "Error parsing the divetime"
msgstr "Fehler beim Analysieren der Dauer"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Fehler beim Analysieren der Gas Informationen"
@@ -399,11 +418,11 @@ msgstr "Fehler beim Analysieren der Gas Informationen"
msgid "Error parsing the maxdepth"
msgstr "Fehler beim Analysieren der maximalen Tiefe"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Fehler beim Auswerten der Samples"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Fehler bei der Registrierung der Abbruchbehandlung"
@@ -411,48 +430,48 @@ msgstr "Fehler bei der Registrierung der Abbruchbehandlung"
msgid "Error registering the data"
msgstr "Fehler beim Registrieren der Daten"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Fehler beim Registrieren der Ereignisbehandlung"
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Ereignis: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Ereignis: warte auf Benutzer Aktion"
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Alle ausfalten"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Fehler beim Öffnen von %i Dateien"
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Fehler beim Analysieren von '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Fehler beim Analysieren von '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Fehler beim Lesen von '%s'.\n"
@@ -461,23 +480,27 @@ msgstr "Fehler beim Lesen von '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "Fuß"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Datei"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filter"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Fr"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Gasverbrauch"
@@ -485,15 +508,19 @@ msgstr "Gasverbrauch"
msgid "Gasmix"
msgstr "Gasmischung"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Hilfe"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "XML Datei(en) einlesen..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Informatinen"
@@ -510,40 +537,40 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "Liter"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Ort"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Log"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Max."
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Längster Tauchgang"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Alarm: Batterie schwach"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Warnung: Batterie schwach"
@@ -551,31 +578,31 @@ msgstr "Warnung: Batterie schwach"
msgid "Mar"
msgstr "Mär"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Markierung"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Leiter"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Warnung: Maximale Deco Zeit"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Max. Tiefe"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Max. AMV"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -590,17 +617,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Max.Druck"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Max."
@@ -609,46 +636,51 @@ msgstr "Max."
msgid "May"
msgstr "Mai"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Tauchgänge löschen"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Reise mit der darüber verbinden"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Reise mit der darunter verbinden"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "Meter"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Min. Tiefe"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Min. AMV"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Min. Temp."
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Verschiedene Optionen"
@@ -656,23 +688,23 @@ msgstr "Verschiedene Optionen"
msgid "Mon"
msgstr "Mo"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Multi-Platform Tauchprogram in C"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Neu"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Neue erste Nummer"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Keine Flaschen Informationen"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Notizen"
@@ -684,7 +716,7 @@ msgstr "Nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -692,15 +724,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Unbekannter pthread Fehlercode"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Datei öffnen"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Öffnen..."
@@ -708,27 +740,27 @@ msgstr "Öffnen..."
msgid "PO2"
msgstr "PO2"
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Alarm: Aufstieg / PO2"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Warnung: Aufstieg / PO2"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Warnung: PO2 Grün"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Einstellungen"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Einstellungen..."
@@ -736,80 +768,76 @@ msgstr "Einstellungen..."
msgid "Pressure"
msgstr "Druck"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Druck:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Schön drucken"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Nur ausgewählte Tauchgänge drucken"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Auswahl drucken"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Art des Ausdrucks"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Drucken..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Beenden"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Alarm: verbleibende Gas-Zeit"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Warnung: verbleibende Gas-Zeit"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Bewertung"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Lese Tauchgang %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Reise entfernen"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Tauchgang aus Reise entfernen"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Neu nummerieren"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Neu nummerieren..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Wiederholen"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "AMV"
@@ -817,7 +845,7 @@ msgstr "AMV"
msgid "SDE file"
msgstr "SDE Datei"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Verletzung des Sicherheitsstops"
@@ -825,28 +853,30 @@ msgstr "Verletzung des Sicherheitsstops"
msgid "Sat"
msgstr "Sa"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Speichern unter..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Änderungen speichern?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Datei speichern unter"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Speichern..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Ereignisse auswählen"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Ereignisse auswählen..."
#: main.c:47
@@ -861,28 +891,32 @@ msgstr ""
"Unvollständiger Schreibvorgang der req.txt Datei\n"
"Ist der Uemis Zurich korrekt verbunden?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Kürzester Tauchgang"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Spalten anzeigen"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Größe"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarm: Geschwindigkeit"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Warnung: Geschwindigkeit"
@@ -890,15 +924,15 @@ msgstr "Warnung: Geschwindigkeit"
msgid "Start"
msgstr "Start"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Statistiken"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Statistiken"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Anzug"
@@ -907,35 +941,39 @@ msgstr "Anzug"
msgid "Sun"
msgstr "So"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Oberflächenpause"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Tabellenausdruck"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Flaschenwechsel Vorschlag"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Info: Flaschendruck"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temperatur"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Temperatur:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Drei"
@@ -943,25 +981,25 @@ msgstr "Drei"
msgid "Thu"
msgstr "Do"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Zeit"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Zoom ein-/ausschalten"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Gesamt"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Gesamtzeit"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -996,11 +1034,11 @@ msgstr ""
"Bitte den Tauchcomputer ausstecken und wieder einstecken\n"
"und erneut versuchen"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Uemis Initialisierung fehlgeschlagen"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "Fehler beim Erzeugen des libdivecomputer Contexts"
@@ -1009,24 +1047,28 @@ msgstr "Fehler beim Erzeugen des libdivecomputer Contexts"
msgid "Unable to create parser for %s %s"
msgstr "Nicht in der Lage, einen Parser für %s %s zu erstellen"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Fehler beim Öffnen von %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Einheiten"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Ansicht"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Volumen:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Wassertemperatur"
@@ -1034,7 +1076,7 @@ msgstr "Wassertemperatur"
msgid "Wed"
msgstr "Mi"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Gewicht"
@@ -1042,23 +1084,23 @@ msgstr "Gewicht"
msgid "Weight System"
msgstr "Gewicht"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Gewicht:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML Datei"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Jahr"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Jährliche Statistiken"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1066,7 +1108,7 @@ msgstr ""
"Nicht alle Änderungen wurden gespeichert.\n"
"Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1075,7 +1117,7 @@ msgstr ""
"Nicht alle Änderungen in der Dati %s wurden gespeichert.\n"
"Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "Luft"
@@ -1107,7 +1149,7 @@ msgstr "Gürtel"
msgid "bookmark"
msgstr "Markierung"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "Minimaltiefe"
@@ -1123,7 +1165,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "cu.ft."
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "Deko"
@@ -1135,7 +1177,7 @@ msgstr "tiefer Stopp"
msgid "divetime"
msgstr "Dauer"
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1155,7 +1197,7 @@ msgstr "integriert"
msgid "invalid event number"
msgstr "ungültige Ereignisnummer"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1163,11 +1205,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "US Pfund"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1175,16 +1217,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "Max. Tiefe"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "mehr als %d Tage"
@@ -1193,6 +1235,22 @@ msgstr "mehr als %d Tage"
msgid "none"
msgstr "keine"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "Pa"
@@ -1230,7 +1288,7 @@ msgid "tissue level warning"
msgstr "Warnung auf Gewebe-Ebene"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr "Dirk Hohndel"
@@ -1242,7 +1300,7 @@ msgstr "Sender"
msgid "unkn"
msgstr "unbk"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "unbekannt"
@@ -1265,6 +1323,12 @@ msgstr "Arbeit"
#~ msgid "About"
#~ msgstr "Info"
+#~ msgid "Delete"
+#~ msgstr "Löschen"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Tauchgang löschen"
+
#~ msgctxt "Depth"
#~ msgid ""
#~ "Depth\n"
@@ -1273,6 +1337,9 @@ msgstr "Arbeit"
#~ "Tiefe\n"
#~ "Ø"
+#~ msgid "Device name"
+#~ msgstr "Gerätename"
+
#~ msgctxt "Duration"
#~ msgid ""
#~ "Duration\n"
@@ -1281,6 +1348,9 @@ msgstr "Arbeit"
#~ "Dauer\n"
#~ "Gesamt"
+#~ msgid "Pretty print"
+#~ msgstr "Schön drucken"
+
#~ msgctxt "SAC"
#~ msgid ""
#~ "SAC\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index c3d4963..2dad492 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-22 07:55-0300\n"
"Last-Translator: Sergio Schvezov <sergiusens at ieee.org>\n"
"Language-Team: Spanish\n"
@@ -19,20 +19,20 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr "> Mes"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Por favor, seleccione el ordenador de buceo y el dispositivo."
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "#"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -44,59 +44,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr ""
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr ""
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr ""
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr ""
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d minutos"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd, %dh %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dh %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) o (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "Sobre Subsurface"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Añadir inmersión ..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Añadir inmersión"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Añadir al viaje anterior"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Temp media"
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "Abr"
@@ -105,87 +127,87 @@ msgstr "Abr"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Auto Agrupar"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Automáticamente agrupar las inmersiones en viajes"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Media"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Media"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Promedio"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Media"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Profundidad media"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "SAC medio"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Temp media"
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Media de tiempo"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "Bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Compañero"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Seleccionar archivo XML predeterminado"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Elegir archivos XML para importar en archivo de datos actual"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Cerrar"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Contraer todo"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Crear nuevo viaje por encima"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "pie^3"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Bot"
@@ -197,15 +219,15 @@ msgstr "Botella"
msgid "Cylinders"
msgstr "Botellas"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Fecha"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Fecha y hora"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Fecha:"
@@ -213,46 +235,38 @@ msgstr "Fecha:"
msgid "Dec"
msgstr "Dic"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Archivo XML por defecto"
-#: info.c:256
-msgid "Delete"
-msgstr "Eliminar"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Eliminar inmersión"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Eliminar inmersión"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Eliminar inmersiones"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Profundidad"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Profundidad (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Superado límite de profundidad"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Profundidad:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Nombre del dispositivo"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -270,103 +284,103 @@ msgstr "Inmersión #%d -"
msgid "Dive %d: %s %d %04d"
msgstr "Inmersión #%d:%s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Información de la inmersión"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Notas de la inmersión"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Duración de la inmersión"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Alerta de duración de inmersión"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Información sobre la ruración de lainmersión"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Ordenador de Buceo"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Error al importar datos de inmersiones"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Detalles de la inmersión"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Guía"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Inmersión #"
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Fuente de lista de inmersiones"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Inmersiones"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Descargar desde el ordenador de Buceo"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Descargar desde el ordenador de Buceo..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Duración"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Duración (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Editar"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Editar el viaje"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Editar resumen del viaje"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Editar inmersión"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Editar inmersiones"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Editar múltiples inmersiones"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Editar resumen del viaje"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Activar / Desactivar eventos"
@@ -374,10 +388,15 @@ msgstr "Activar / Desactivar eventos"
msgid "End"
msgstr "Fin"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Equipo"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Error al analizar las muestras"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Error al analizar la fecha"
@@ -386,7 +405,7 @@ msgstr "Error al analizar la fecha"
msgid "Error parsing the divetime"
msgstr "Error al analizar el tiempo de buceo"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Error al analizar la mezcla de gas"
@@ -398,11 +417,11 @@ msgstr "Error al analizar el conteo de mezcla de gas"
msgid "Error parsing the maxdepth"
msgstr "Error al analizar la máxima profundidad"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Error al analizar las muestras"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Error al registrar el manejador de cancelación"
@@ -410,48 +429,48 @@ msgstr "Error al registrar el manejador de cancelación"
msgid "Error registering the data"
msgstr "Error al registrar los datos"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Error al registrar el manejador de eventos"
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr ""
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Evento: aguardando acción del usuario"
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Expandir todos"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "No se pudo abrir los %i archivos."
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "No se pudo analizar '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "No se pudo analizar '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "No se pudo leer '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "No se pudo leer '%s'.\n"
@@ -460,23 +479,27 @@ msgstr "No se pudo leer '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "Pies"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Archivo"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filtros"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Vi"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Gas usado"
@@ -484,15 +507,19 @@ msgstr "Gas usado"
msgid "Gasmix"
msgstr "Mezcla de gas"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Ayuda"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Importar Archivo(s) XML..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Info"
@@ -509,40 +536,40 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel y otros, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Lista"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "Litro"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Ubicación"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Log"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Más Prolongado"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Inmersión más prolongada"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Alerta de Batería Baja"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Advertencia de Batería Baja"
@@ -550,31 +577,31 @@ msgstr "Advertencia de Batería Baja"
msgid "Mar"
msgstr "Mar"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Marcador"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Guía"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Advertencia de tiempo max deco"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Profundidad max"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Max SAC"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -589,17 +616,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Pres. max."
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Máxima"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Máximo"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Máxima"
@@ -608,46 +635,51 @@ msgstr "Máxima"
msgid "May"
msgstr "Mayo"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Eliminar inmersiones"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Combinar viaje con el viaje de encima"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Combinar viaje con el viaje de abajo"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "Metro"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Profundidad mínima"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Min SAC"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Min Temp"
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Mínima"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Mínimo"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Mínima"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Opciones Varias"
@@ -655,23 +687,23 @@ msgstr "Opciones Varias"
msgid "Mon"
msgstr "Lu"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Software multi-plataforma escrito en C para DiveLog"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Nuevo"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Nuevo número de partida"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "No se degistran datos de botella"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Notas"
@@ -683,7 +715,7 @@ msgstr "Nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -691,15 +723,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "Oct"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Error de lectura"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Abrir archivo"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Abrir..."
@@ -707,27 +739,27 @@ msgstr "Abrir..."
msgid "PO2"
msgstr ""
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Alarma de Ascenso PpO2"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Aviso de Ascenso PpO2"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Aviso Verde PpO2"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Preferencias"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Preferencias..."
@@ -735,80 +767,76 @@ msgstr "Preferencias..."
msgid "Pressure"
msgstr "Presión"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Presión:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Impresión gráfica"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Imprimir sólo inmersiones seleccionadas"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Imprimir selección"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Tipo de impresión"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Imprimir..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Perfil"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Salir"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Alerta tiempo de gas restante"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Aviso tiempo de gas restante"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Valoración"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Leyendo inmersiones %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Eliminar viaje"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Eliminar inmersión del viaje"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Eliminar selección de inmersiones del viaje"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Renumerar"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Renumerar..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Intentar de nuevo"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "SAC"
@@ -816,7 +844,7 @@ msgstr "SAC"
msgid "SDE file"
msgstr "SDE archivo"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Violación de parada de seguridad"
@@ -824,28 +852,30 @@ msgstr "Violación de parada de seguridad"
msgid "Sat"
msgstr "Sa"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Guardar como..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "¿Guardar cambios?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Guardar Archivo Como"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Guardar..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Seleccionar eventos"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Seleccionar eventos..."
#: main.c:47
@@ -860,28 +890,32 @@ msgstr ""
"Escritura corta al archivo req.txt \n"
"¿Está el Zúrich Uemis correctamente conectado?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Más corta"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Inmersión más corta"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Mostrar Columnas"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Tamaño"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarma de Velocidad"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Advertencia de velocidad`"
@@ -889,15 +923,15 @@ msgstr "Advertencia de velocidad`"
msgid "Start"
msgstr "Inicio"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Estadísticas"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Estadísticas"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Traje"
@@ -906,35 +940,39 @@ msgstr "Traje"
msgid "Sun"
msgstr "Do"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Interv. Superf."
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Impresión de tabla"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Sugerencia de cambio de botella"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Información sobre presión de botella"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temp"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Temperatura"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Temperatura"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Todo"
@@ -942,25 +980,25 @@ msgstr "Todo"
msgid "Thu"
msgstr "Ju"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Tiempo"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Activar / Desactivar Zoom"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Tiempo total"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -995,11 +1033,11 @@ msgstr ""
"Desconectar / conectar el ordenador de buceo\n"
"e inténtelo de nuevo"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Fallo al intentar iniciar Uemis"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "No es posible crear el contexto de libdivecomputer"
@@ -1008,24 +1046,28 @@ msgstr "No es posible crear el contexto de libdivecomputer"
msgid "Unable to create parser for %s %s"
msgstr "No es posible crear el analizador para %s %s"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "No se pudo abrir %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Unidades"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Ver"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Volumen:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Temp. de Agua"
@@ -1033,7 +1075,7 @@ msgstr "Temp. de Agua"
msgid "Wed"
msgstr "Mi"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Peso"
@@ -1041,23 +1083,23 @@ msgstr "Peso"
msgid "Weight System"
msgstr "Sistema de lastre"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Peso:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML archivo"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Año"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Estadísticas anuales"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1065,7 +1107,7 @@ msgstr ""
"Has guardado los cambios \n"
"¿Te gustaría guardar los cambios antes de cerrar el archivo de datos?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1074,7 +1116,7 @@ msgstr ""
"Tienes cambios sin guardar en el archivo: %s \n"
"¿Te gustaría guardar los cambios antes de cerrar el archivo de datos?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "aire"
@@ -1106,7 +1148,7 @@ msgstr "cinturón"
msgid "bookmark"
msgstr "favorito"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "techo"
@@ -1122,7 +1164,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "pie^3"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "deco"
@@ -1134,7 +1176,7 @@ msgstr "parada de profundidad"
msgid "divetime"
msgstr "duración de inmersión"
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "pies"
@@ -1154,7 +1196,7 @@ msgstr "integrado"
msgid "invalid event number"
msgstr "Número de evento inválido"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1162,11 +1204,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "libra"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1174,16 +1216,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "Profundidad Max"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "modelo=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "más de %d días"
@@ -1192,6 +1234,22 @@ msgstr "más de %d días"
msgid "none"
msgstr "ninguno"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "pascal"
@@ -1229,9 +1287,10 @@ msgid "tissue level warning"
msgstr "Alarma de nivel de tejidos"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
-msgstr "José Ángel Tortosa Delfa\n"
+msgstr ""
+"José Ángel Tortosa Delfa\n"
"Pablo García Castro\n"
"Matthias Kaehlcke\n"
"Sergio Schvezov\n"
@@ -1246,7 +1305,7 @@ msgstr "transmisor"
msgid "unkn"
msgstr "desc"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "desconocido"
@@ -1269,6 +1328,12 @@ msgstr "carga"
#~ msgid "About"
#~ msgstr "Acerca de"
+#~ msgid "Delete"
+#~ msgstr "Eliminar"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Eliminar inmersión"
+
#~ msgctxt "Depth"
#~ msgid ""
#~ "Depth\n"
@@ -1277,6 +1342,9 @@ msgstr "carga"
#~ "Profundidad\n"
#~ "Promedio"
+#~ msgid "Device name"
+#~ msgstr "Nombre del dispositivo"
+
#~ msgctxt "Duration"
#~ msgid ""
#~ "Duration\n"
@@ -1285,6 +1353,9 @@ msgstr "carga"
#~ "Duración\n"
#~ "Total"
+#~ msgid "Pretty print"
+#~ msgstr "Impresión gráfica"
+
#~ msgctxt "SAC"
#~ msgid ""
#~ "SAC\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 0832d7e..8ccbf2f 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-21 16:31+0200\n"
"Last-Translator: Miika Turkia <miika.turkia at gmail.com>\n"
"Language-Team: Finnish\n"
@@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Kuukausi"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr "Valitse sukellustietokone ja laitenimi."
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "#"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -44,59 +44,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s %2$s. %4$d. %3$skuuta %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s, %3$d. %2$skuuta %4$d, %5$d:%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s %3$d. %2$skuuta %4$d %5$2d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s, %3$d. %2$skuuta %4$d, %5$d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%d pv %d t %d min"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%d t %d min"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) tai (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "Tietoja Subsurfacesta"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Lisää sukellus..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Lisää sukellus"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Liitä yllä olevaan retkeen"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Keskilämpötila"
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "huhti"
@@ -105,87 +127,87 @@ msgstr "huhti"
msgid "Aug"
msgstr "elo"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Automaattinen ryhmittely"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Ryhmittele sukellukset retkiin automaattisesti"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Keskisyvyys"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Pintakulutus"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Keskilämpötila"
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Keskipituus"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Sukelluspari"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Valitse oletustiedosto"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Valitse tietoihin liitettävät XML-tiedostot"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Sulje"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Supista kaikki retket"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Liitä uuteen retkeen"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "kuutiojalka"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Säiliöt"
@@ -197,15 +219,15 @@ msgstr "Säiliöt"
msgid "Cylinders"
msgstr "Säiliöt"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Ajankohta"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Päivä ja aika"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Päivä:"
@@ -213,46 +235,38 @@ msgstr "Päivä:"
msgid "Dec"
msgstr "joulu"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Oletustiedosto"
-#: info.c:256
-msgid "Delete"
-msgstr "Poista"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Poista sukellus"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Poista sukellus"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Poista sukellukset"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Syvyys"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Syvyys (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Syvyysraja ylitetty"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Syvyys:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Laitenimi"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -270,103 +284,103 @@ msgstr "Sukellus #%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Sukellus %1$d: %3$d. %2$skuuta %4$04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Tiedot"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Muistiinpanot"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Sukellusaika"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Huomautus: sukellusaika"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Tiedotus: sukellusaika"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Sukellustietokone"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Virhe sukellusten jäsentämisessä"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Tiedot"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Sukellusvanhin"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Sukellus"
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Sukelluslistan kirjasin"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Sukellusvanhin"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Sukelluskerrat"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Hae sukellustietokoneelta"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Hae sukellustietokoneelta..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Kesto"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Kesto (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Muuta"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Muuta retken tietoja"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Muuta retken tietoja"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Muuta sukelluksen tietoja"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Muuta sukelluksen tietoja"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Muuta valittujen sukellusten tietoja"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Muuta retken tietoja"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Näytä / piilota tapahtumamerkit"
@@ -374,10 +388,15 @@ msgstr "Näytä / piilota tapahtumamerkit"
msgid "End"
msgstr "Loppu"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Varusteet"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Virhe näytteiden tulkinnassa"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Virhe ajan jäsentämisessä"
@@ -386,7 +405,7 @@ msgstr "Virhe ajan jäsentämisessä"
msgid "Error parsing the divetime"
msgstr "Virhe sukelluksen keston jäsentämisessä"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Virhe kaasuseoksen jäsentämisessä"
@@ -398,11 +417,11 @@ msgstr "Virhe kaasuseosten määrän jäsentämisessä"
msgid "Error parsing the maxdepth"
msgstr "Virhe maksimisyvyyden jäsentämisessä"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Virhe näytteiden tulkinnassa"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Virhe perumiskäsittelijän rekisteröinnissä."
@@ -410,48 +429,48 @@ msgstr "Virhe perumiskäsittelijän rekisteröinnissä."
msgid "Error registering the data"
msgstr "Virhe tiedon rekisteröinnissä"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Virhe tapahtumakäsittelijän rekisteröinnissä."
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, fuzzy, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Tapahtuma: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Tapahtuma: odotetaan käyttäjän toimia"
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Laajenna kaikki retket"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "%i tiedoston avaaminen epäonnistui."
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Tiedoston '%s' lukeminen epäonnistui."
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Tiedoston '%s' avaaminen epäonnistui"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
@@ -460,23 +479,27 @@ msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
msgid "Feb"
msgstr "helmi"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "jalka"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Tiedosto"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Suodattimet"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "pe"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Kulutus"
@@ -484,15 +507,19 @@ msgstr "Kulutus"
msgid "Gasmix"
msgstr "Kaasuseos"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Ohje"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Liitä tiedot XML-tiedostosta..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Tiedot"
@@ -509,40 +536,40 @@ msgstr "heinä"
msgid "Jun"
msgstr "kesä"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel et al., 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Sukelluslista"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "litra"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Kohde"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Loki"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Pisin"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Pisin sukellus"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Huomautus: heikko paristo"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Varoitus: heikko paristo"
@@ -550,31 +577,31 @@ msgstr "Varoitus: heikko paristo"
msgid "Mar"
msgstr "maalis"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "merkki"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Sukellusvanhin"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Varoitus: etappipysähdysaika"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Suurin syvyys"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Suurin pintakulutus"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Ylin lämpötila"
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -589,17 +616,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Nimellispaine"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Suurin"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Suurin"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Korkein"
@@ -608,46 +635,51 @@ msgstr "Korkein"
msgid "May"
msgstr "touko"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Poista sukellukset"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Liitä retki yllä olevaan retkeen"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Liitä retki alla olevaan retkeen"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "metri"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Pienin syvyys"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Pienin pintakulutus"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Alin lämpötila"
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Pienin"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Pienin"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Alin"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Sekalaiset asetukset"
@@ -655,23 +687,23 @@ msgstr "Sekalaiset asetukset"
msgid "Mon"
msgstr "ma"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Usean laitealustan sukelluspäiväkirjaohjelma C-kielellä"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Uusi"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Uusi aloitusnumero"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Ei tietoja säiliöistä"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Muistiinpanot"
@@ -683,7 +715,7 @@ msgstr "marras"
msgid "OLF"
msgstr "Happikertymä"
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "Happikertymä"
@@ -691,15 +723,15 @@ msgstr "Happikertymä"
msgid "Oct"
msgstr "loka"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Outo pthread-virheen paluukoodi"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Avaa tiedosto"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Avaa..."
@@ -707,27 +739,27 @@ msgstr "Avaa..."
msgid "PO2"
msgstr "PO2"
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Huomautus: hapen osapaine"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Varoitus: hapen osapaine"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Varoitus: hapen osapaine (green) TODO"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Asetukset"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Asetukset..."
@@ -735,80 +767,76 @@ msgstr "Asetukset..."
msgid "Pressure"
msgstr "Paine"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Paine:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Hieno tuloste"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Tulosta valitut sukellukset"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Tulosteen valinta"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Tulosteen tyyppi"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Tulosta..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profiilikuvaaja"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Lopeta"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Huomautus: kaasumäärä"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Varoitus: kaasumäärä"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Yleisarvio"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Luetaan sukellusta %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Poista retki"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Erota sukellus pois retkestä"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Erota valitut sukellukset pois retkestä"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Uudellennumeroi"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Uudellennumeroi..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Yritä uudestaan"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "Pintakulutus"
@@ -816,7 +844,7 @@ msgstr "Pintakulutus"
msgid "SDE file"
msgstr "SDE-tiedosto"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Turvapysähdyksen laiminlyönti"
@@ -824,28 +852,30 @@ msgstr "Turvapysähdyksen laiminlyönti"
msgid "Sat"
msgstr "la"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Tallenna nimellä..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Tallenna muutokset?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Tallenna nimellä"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Tallenna..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Valitse tapahtumat"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Valitse tapahtumat..."
#: main.c:47
@@ -860,28 +890,32 @@ msgstr ""
"Tiedoston req.txt kirjoittaminen epäonnistui.\n"
"Onko Uemis Zurich kytketty oikein?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Lyhin"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Lyhin sukellus"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Näytä sarakkeet"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Tilavuus"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Huomautus: nousunopeus"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Varoitus: nousunopeus"
@@ -889,15 +923,15 @@ msgstr "Varoitus: nousunopeus"
msgid "Start"
msgstr "Alku"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Tilastot"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Tilastot"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Puku"
@@ -906,35 +940,39 @@ msgstr "Puku"
msgid "Sun"
msgstr "su"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Pinta-aika"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Taulukkotuloste"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Säiliönvaihtoehdotus"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Tiedotus: säiliöpaine"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Lämpötila"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Lämpötila"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Lämpötila:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Kaikki"
@@ -942,25 +980,25 @@ msgstr "Kaikki"
msgid "Thu"
msgstr "to"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Kello"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Venytä sukellusprofiilikuvaajaa"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Yhteensä"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Kokonaisaika"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -995,11 +1033,11 @@ msgstr ""
"Liitä sukellustietokone uudestaan\n"
"ja yritä uudestaan."
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Uemiksen lukeminen epäonnistui"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "libdivecomputer kontekstin luominen epäonnistui"
@@ -1008,24 +1046,28 @@ msgstr "libdivecomputer kontekstin luominen epäonnistui"
msgid "Unable to create parser for %s %s"
msgstr "Jäsentäjän luominen %s %s epäonnistui"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, fuzzy, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Avaaminen epäonnistui %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Yksiköt"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Näytä"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Tilavuus:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Veden lämpötila"
@@ -1033,7 +1075,7 @@ msgstr "Veden lämpötila"
msgid "Wed"
msgstr "ke"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Painot"
@@ -1041,23 +1083,23 @@ msgstr "Painot"
msgid "Weight System"
msgstr "Painot"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Massa:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML-tiedosto"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Vuosi"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Vuositilastot"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1065,7 +1107,7 @@ msgstr ""
"Sinulla on tallentamattomia muutoksia.\n"
"Haluatko tallentaa muutokset ennen tietojen sulkemista?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1074,7 +1116,7 @@ msgstr ""
"Tiedosto %s on muuttunut.\n"
"Haluatko tallentaa muutokset ennen tietojen sulkemista?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "ilma"
@@ -1106,7 +1148,7 @@ msgstr "vyöpaino"
msgid "bookmark"
msgstr "kirjanmerkki"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "katto"
@@ -1122,7 +1164,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "ft³"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "etappipysähdys"
@@ -1134,7 +1176,7 @@ msgstr "syväpysähdys"
msgid "divetime"
msgstr "sukellusaika"
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1154,7 +1196,7 @@ msgstr "integroitu"
msgid "invalid event number"
msgstr "tuntematon tapahtumanumero"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1162,11 +1204,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "pauna"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1174,16 +1216,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "Suurin syvyys"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "yli %d päivää"
@@ -1192,6 +1234,22 @@ msgstr "yli %d päivää"
msgid "none"
msgstr "ei mitään"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "Pa"
@@ -1229,7 +1287,7 @@ msgid "tissue level warning"
msgstr "kudoskertymän varoitus"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr ""
"Tommi Saviranta\n"
@@ -1243,7 +1301,7 @@ msgstr "lähetin"
msgid "unkn"
msgstr "tuntematon"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "tuntematon"
@@ -1268,3 +1326,15 @@ msgstr "työmäärä"
#~ msgid "About"
#~ msgstr "Tietoja"
+
+#~ msgid "Delete"
+#~ msgstr "Poista"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Poista sukellus"
+
+#~ msgid "Device name"
+#~ msgstr "Laitenimi"
+
+#~ msgid "Pretty print"
+#~ msgstr "Hieno tuloste"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 31e144e..b3b0e71 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-27 02:44+0200\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-27 02:44+0200\n"
"Last-Translator: Stéphane Raimbault <stephane.raimbault at gmail.com>\n"
"Language-Team: French\n"
@@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > mois"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Veuillez choisir un ordinateur de plongée et un périphérique. "
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "N°"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -44,59 +44,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s %4$d %3$s %5$d, %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s %3$d %2$s, %4$d, %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s %3$d %2$s %4$d, %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s %3$d %2$s %4$d, %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%d j %d h %d min"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%d h %d min"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) ou (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "À propos de Subsurface"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Ajouter une plongée..."
-#: divelist.c:2077
+#: divelist.c:2168
msgid "Add dive"
msgstr "Ajouter une plongée"
-#: divelist.c:2156
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Ajouter au groupe au-dessus"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Temp. moy."
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "Avril"
@@ -105,87 +127,87 @@ msgstr "Avril"
msgid "Aug"
msgstr "Août"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Grouper automatiquement"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Grouper automatiquement les plongées"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Profondeur moy."
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Consommation d'air moy."
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Temp. moy."
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Temps moy."
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "bar"
-#: info.c:482 info.c:909 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Binôme"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Choisissez le fichier XML par défaut"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Choisissez le fichier XML à importer dans les données actuelles"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Fermer"
-#: divelist.c:2173
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Tout replier"
-#: divelist.c:2146
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Créer un nouveau groupe au-dessus"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "Pieds³"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Blk"
@@ -197,15 +219,15 @@ msgstr "Block"
msgid "Cylinders"
msgstr "Blocks"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Date"
-#: info.c:774
+#: info.c:833
msgid "Date and Time"
msgstr "Date et heure"
-#: info.c:784
+#: info.c:843
msgid "Date:"
msgstr "Date :"
@@ -213,38 +235,38 @@ msgstr "Date :"
msgid "Dec"
msgstr "Déc."
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Fichier XML par défaut"
-#: divelist.c:1946 divelist.c:2025 divelist.c:2064
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Supprimer la plongée"
-#: divelist.c:1948 divelist.c:2063
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Supprimer les plongées"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Profondeur"
-#: info.c:834
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Profondeur (%s) :"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Profondeur plafond dépassée"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Profondeur :"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Nom du périphérique"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -262,71 +284,71 @@ msgstr "Plongée n°%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Plongée n°%d - %s %d %04d"
-#: gtk-gui.c:1134 info.c:667 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Détails de plongée"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Notes de Plongée"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Temps de plongée"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Alerte temps de plongée"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Information du temps de plongée"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Ordinateur de plongée"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Erreur à l'import des données de plongées"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Détails de plongée"
-#: info.c:481
+#: info.c:526
msgid "Dive master"
msgstr "Chef de Palanquée"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Plongée n°"
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Police pour la liste de plongée"
-#: info.c:908
+#: info.c:967
msgid "Divemaster"
msgstr "Chef de palanquée"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Plongées"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Télécharger depuis l'ordinateur de plongée"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Télécharger depuis l'ordinateur de plongée..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Durée"
-#: info.c:829
+#: info.c:888
msgid "Duration (min)"
msgstr "Durée (min)"
@@ -334,31 +356,31 @@ msgstr "Durée (min)"
msgid "Edit"
msgstr "Modifier"
-#: info.c:626
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Modifier les informations du groupe"
-#: divelist.c:2085
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Modifier le résumé du groupe"
-#: divelist.c:2061
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Modifier la plongée"
-#: divelist.c:2060
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Modifier les plongées"
-#: info.c:469
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Modifier plusieurs plongées"
-#: info.c:449
+#: info.c:491
msgid "Edit trip summary"
msgstr "Modifier le résumé du groupe"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Activer / Désactiver évênements"
@@ -366,10 +388,15 @@ msgstr "Activer / Désactiver évênements"
msgid "End"
msgstr "Fin"
-#: gtk-gui.c:1130 info.c:502
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Équipement"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Impossible d'analyser des échantillons"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Impossible d'analyser l'heure"
@@ -378,7 +405,7 @@ msgstr "Impossible d'analyser l'heure"
msgid "Error parsing the divetime"
msgstr "Impossible d'analyser le temps de plongée"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Impossible d'analyser le mélange gazeux"
@@ -390,11 +417,11 @@ msgstr "Impossible d'analyser le nombre de mélange gazeux"
msgid "Error parsing the maxdepth"
msgstr "Impossible d'analyser la profondeux maximale"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Impossible d'analyser des échantillons"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Impossible d'enregistrer le gestionnaire d'annulation."
@@ -402,48 +429,48 @@ msgstr "Impossible d'enregistrer le gestionnaire d'annulation."
msgid "Error registering the data"
msgstr "Impossible d'enregistrer de la date"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Impossible d'enregistrer le gestionnaire d'événement."
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Événement : systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Événement : attente d'une action de l'utilisateur"
-#: divelist.c:2170
+#: divelist.c:2265
msgid "Expand all"
msgstr "Tout déplier"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Impossible de l'ouverture du fichier %i."
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Impossible d'analyser « %s »"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Impossible d'analyser « %s ».\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Impossible de la lecture « %s »"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Impossible de lire « %s ».\n"
@@ -452,23 +479,27 @@ msgstr "Impossible de lire « %s ».\n"
msgid "Feb"
msgstr "Fév."
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "Pieds"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Fichier"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filtrer"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Ven."
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Air utilisé"
@@ -476,15 +507,19 @@ msgstr "Air utilisé"
msgid "Gasmix"
msgstr "Mélange gazeux"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Aide"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Importer les fichiers XML..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Information"
@@ -501,40 +536,40 @@ msgstr "Juil."
msgid "Jun"
msgstr "Juin"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel et autres, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "Litre"
-#: divelist.c:1273 info.c:454 info.c:476 info.c:903 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Lieu"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Journal"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Plus longue"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Plongée la plus longue"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Alarme de batterie faible"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Avertissement de batterie faible"
@@ -542,31 +577,31 @@ msgstr "Avertissement de batterie faible"
msgid "Mar"
msgstr "Mar."
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Marker"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Chef"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Avertissement de temps de décompression max"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Profondeur max."
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Consommation d'air max."
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Temp. max."
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -581,17 +616,17 @@ msgstr ""
msgid "MaxPress"
msgstr "PressionMax"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Maximum"
@@ -600,46 +635,51 @@ msgstr "Maximum"
msgid "May"
msgstr "Mai"
-#: divelist.c:2093
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Supprimer les plongées"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Fusionner le groupe avec le groupe au dessus"
-#: divelist.c:2103
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Fusionner le groupe avec le groupe au dessous"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "Mètre"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Profondeur min."
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Consommation d'air min."
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Temp. min."
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Options diverses"
@@ -647,23 +687,23 @@ msgstr "Options diverses"
msgid "Mon"
msgstr "Lun."
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Journal de plongée multi-système écrit en C"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Nouveau"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Nouveau numéro de départ"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Pas d'information sur le block"
-#: info.c:459 info.c:494 info.c:917
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Notes"
@@ -675,7 +715,7 @@ msgstr "Nov."
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -683,15 +723,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "Oct."
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Étrange erreur pthread retournée"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Ouvrir Fichier"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Ouvrir..."
@@ -699,27 +739,27 @@ msgstr "Ouvrir..."
msgid "PO2"
msgstr "PO2"
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Alarme PO2 ascendant"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Avertissement PO2 ascendant"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Avertissement PO2 Vert"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Préférences"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Préférences..."
@@ -727,80 +767,76 @@ msgstr "Préférences..."
msgid "Pressure"
msgstr "Pression"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Pression :"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Impression mise en forme"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Imprimer uniquement les plongées selectionnées"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Imprimer la sélection"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Type d'impression"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Imprimer..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Quitter"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Alerte temps air restant"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Avertissement temps d'air restant"
-#: info.c:487 info.c:914
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Évaluation"
-#: uemis-downloader.c:445
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Lecture de la plongée %s"
-#: divelist.c:1818 divelist.c:2108
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Supprimer groupe"
-#: divelist.c:2164
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Retirer la plongée du groupe"
-#: divelist.c:2162
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Retirer les plongées sélectionnées du groupe"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Renuméroter"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Renuméroter..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Essayer à nouveau"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "Consommation d'air"
@@ -808,7 +844,7 @@ msgstr "Consommation d'air"
msgid "SDE file"
msgstr "Fichier SDE"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Violation du palier de sécurité"
@@ -816,28 +852,28 @@ msgstr "Violation du palier de sécurité"
msgid "Sat"
msgstr "Sam."
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Enregistrer sous..."
# Title
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Enregistrement des changements ?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Enregistrer le fichier sous"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Enregistrer..."
-#: gtk-gui.c:764
+#: gtk-gui.c:868
msgid "Select Events"
msgstr "Sélection des évènements"
-#: gtk-gui.c:921
+#: gtk-gui.c:1025
msgid "Select Events..."
msgstr "Sélection des événements..."
@@ -853,28 +889,32 @@ msgstr ""
"Écriture partielle des progrès dans le fichier req.txt\n"
"Est-ce que votre Uemis Zurich est branché correctement ?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Plus courte"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Plongée la plus courte"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Afficher les colonnes"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Taille"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarme de vitesse"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Avertissemnt de vitesse"
@@ -882,15 +922,15 @@ msgstr "Avertissemnt de vitesse"
msgid "Start"
msgstr "Début"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Statistiques"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Stats"
-#: divelist.c:1268 gtk-gui.c:647 info.c:488 info.c:915
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Combinaison"
@@ -899,35 +939,39 @@ msgstr "Combinaison"
msgid "Sun"
msgstr "Dim."
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Intervale de surface"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Impression en tableau"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Changement de block suggéré"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Information de pression block"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temp."
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Température"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Température :"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Trois"
@@ -935,25 +979,25 @@ msgstr "Trois"
msgid "Thu"
msgstr "Jeu."
-#: info.c:789 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Temps"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Changer de zoom"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Temps Total"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -988,11 +1032,11 @@ msgstr ""
"Débranchez et re-branchez l'ordinateur\n"
"et re-essayez"
-#: uemis-downloader.c:781
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Impossible d'initialiser Uemis"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "Impossible de créer un context libdivecomputer"
@@ -1001,24 +1045,28 @@ msgstr "Impossible de créer un context libdivecomputer"
msgid "Unable to create parser for %s %s"
msgstr "Impossible de créer une analyse pour %s %s"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Impossible d'ouvrir %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Unités"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Vue"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Volume :"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Temp. de l'eau"
@@ -1026,7 +1074,7 @@ msgstr "Temp. de l'eau"
msgid "Wed"
msgstr "Mer."
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Poids"
@@ -1034,23 +1082,23 @@ msgstr "Poids"
msgid "Weight System"
msgstr "Système de poids"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Poids:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "Fichier XML"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Année"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Statistiques annuelles"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1058,7 +1106,7 @@ msgstr ""
"Vous avez des changements non-enregistrés.\n"
"Souhaitez-vous enregistrer ces changements avant de fermer ?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1067,7 +1115,7 @@ msgstr ""
"Vous avez des changements non-enregistrés dans le fichier : %s \n"
"Souhaitez-vous enregistrer ces changements avant de le fermer ?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "air"
@@ -1099,7 +1147,7 @@ msgstr "ceinture"
msgid "bookmark"
msgstr "marque-page"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "plafond"
@@ -1115,7 +1163,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "pied³"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "décompression"
@@ -1127,7 +1175,7 @@ msgstr "Arrêt profond"
msgid "divetime"
msgstr "Temps de plongée"
-#: dive.c:113 divelist.c:1264 info.c:834
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "pied"
@@ -1147,7 +1195,7 @@ msgstr "intégré"
msgid "invalid event number"
msgstr "numéro d'événement non valide"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1155,11 +1203,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "livre US"
-#: dive.c:108 info.c:834
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1167,16 +1215,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "prof. max"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "modèle=%u (0x%08x), firmware=%u (0x%08x), port série=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "plus de %d jours"
@@ -1185,6 +1233,22 @@ msgstr "plus de %d jours"
msgid "none"
msgstr "aucun"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "pascal"
@@ -1222,7 +1286,7 @@ msgid "tissue level warning"
msgstr "Avertissement de niveau « tissue »"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr ""
"Pierre-Yves Chibon\n"
@@ -1237,7 +1301,7 @@ msgstr "transmetteur"
msgid "unkn"
msgstr "inconnu"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "inconnu"
@@ -1256,3 +1320,9 @@ msgstr "poids"
#: libdivecomputer.c:80
msgid "workload"
msgstr "charge"
+
+#~ msgid "Device name"
+#~ msgstr "Nom du périphérique"
+
+#~ msgid "Pretty print"
+#~ msgstr "Impression mise en forme"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 072a509..4155eaa 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-18 15:00+0100\n"
"Last-Translator: Ivan Habunek <ivan.habunek at gmail.com>\n"
"Language-Team: Croatian\n"
@@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Mjesec"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr "Odaberite ronilačko računalo i naziv uređaja."
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "#"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -44,59 +44,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s %4$d. %3$s %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %dh %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) ili (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr ""
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Dodaj uron..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Dodaj uron"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Dodaj u gornju grupu"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Prosj. temp."
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "Tra"
@@ -105,87 +127,87 @@ msgstr "Tra"
msgid "Aug"
msgstr "Kol"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Automatsko grupiranje"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Automatski grupiraj urone"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Ø"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Ø"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Ø"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Prosj. dubina"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Prosj. SAC"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Prosj. temp."
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Prosj. trajanje"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "Bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Buddy"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celzijus"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Odaberite defaultnu XML datoteku"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Odaberite XML datoteke za uvoz u trenutačnu datoteku"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Zatvori"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Zatvori sve grupe"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Kreiraj novu grupu iznad"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "CuSt"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Boca"
@@ -197,15 +219,15 @@ msgstr "Boca"
msgid "Cylinders"
msgstr "Boce"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Datum"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Datum i vrijeme"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Datum:"
@@ -213,46 +235,38 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Pro"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Defaultna XML datoteka"
-#: info.c:256
-msgid "Delete"
-msgstr "Obriši"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Obriši uron"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Obriši uron"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Obriši urone"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Dubina"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Dubina (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Premašeno ograničenje dubine"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Dubina:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Naziv uređaja"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -270,103 +284,103 @@ msgstr "Uron #%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Uron #%d - %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Informacije o uronu"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Bilješke"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Vrijeme urona"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Alarm: Trajanje urona"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Info: Trajanje urona"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Ronilačko računalo"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr ""
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Podaci o uronu"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Voditelj"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Uron br."
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Font za listu urona"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Voditelj"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Uroni"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Preuzmi s ronilačkog računala"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Preuzmi s ronilačkog računala..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Trajanje"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Trajanje (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Uredi"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Uredi informacije o grupi"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Uredi sažetak grupe"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Uredi uron"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Uredi urone"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Uredi više urona"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Uredi sažetak urona"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Uključi/isključi događaje"
@@ -374,10 +388,14 @@ msgstr "Uključi/isključi događaje"
msgid "End"
msgstr "Kraj"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Oprema"
+#: libdivecomputer.c:289
+msgid "Error obtaining water salinity"
+msgstr ""
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr ""
@@ -386,7 +404,7 @@ msgstr ""
msgid "Error parsing the divetime"
msgstr ""
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr ""
@@ -398,11 +416,11 @@ msgstr ""
msgid "Error parsing the maxdepth"
msgstr ""
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr ""
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr ""
@@ -410,48 +428,48 @@ msgstr ""
msgid "Error registering the data"
msgstr ""
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr ""
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr ""
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr ""
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Otvori sve"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Nije uspjelo otvaranje %i datoteka"
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Nije uspjelo parsiranje '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Nije uspjelo parsiranje '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Nije uspjelo čitanje '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Nije uspjelo čitanje '%s'.\n"
@@ -460,23 +478,27 @@ msgstr "Nije uspjelo čitanje '%s'.\n"
msgid "Feb"
msgstr "Velj"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "Stope"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Datoteka"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filter"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Pet"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Potrošeno plina"
@@ -484,15 +506,19 @@ msgstr "Potrošeno plina"
msgid "Gasmix"
msgstr "Mješavina"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Pomoć"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Uvezi XML datoteke..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Informacije"
@@ -509,40 +535,40 @@ msgstr "Srp"
msgid "Jun"
msgstr "Lip"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel i drugi, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Popis"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "Litra"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Lokacija"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Dnevnik"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Maks."
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Najduži uron"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Alarm: Baterija pri izmaku"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Upozorenje: Baterija pri izmaku"
@@ -550,31 +576,31 @@ msgstr "Upozorenje: Baterija pri izmaku"
msgid "Mar"
msgstr "Ožu"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Oznaka"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Master"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Upozorenje: Max. vrijeme dekompresije"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Maks. dubina"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Najveći SAC"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Maks. temp."
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -589,17 +615,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Maks. pritisak"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Max."
@@ -608,46 +634,51 @@ msgstr "Max."
msgid "May"
msgstr "Svi"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Obriši urone"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Spoji s grupom iznad"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Spoji s grupom ispod"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "Metar"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Najmanja dubina"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Najmanji SAC"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Min. temp."
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Ostale opcije"
@@ -655,23 +686,23 @@ msgstr "Ostale opcije"
msgid "Mon"
msgstr "Pon"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Višeplatformski program za vođenje ronilačkog dnevnika pisan u C-u"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Novi"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Novi početni broj"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Nema podatka o boci"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Bilješke"
@@ -683,7 +714,7 @@ msgstr "Stu"
msgid "OLF"
msgstr ""
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -691,15 +722,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "Lis"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr ""
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Otvori datoteku"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Otvori..."
@@ -707,27 +738,27 @@ msgstr "Otvori..."
msgid "PO2"
msgstr ""
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "PO2 Alarm: Prebrzi izron"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "PO2 Upozorenje: Prebrzi izron"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "PO2 Upozorenje: Zeleno"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Postavke"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Postavke..."
@@ -735,80 +766,76 @@ msgstr "Postavke..."
msgid "Pressure"
msgstr "Pritisak"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Pritisak:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Lijep ispis"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Ispiši odabrane urone"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Ispiši odabrano"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Vrsta ispisa"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Ispis..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Izlaz"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "RTG Alarm"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "RTG Upozorenje"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Ocjena"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Čitanje urona %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Obriši grupu"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Ukloni uron iz grupe"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Ukloni odabrane urone iz grupe"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Renumeriraj"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Renumeriraj..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Pokušaj ponovo"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "SAC"
@@ -816,7 +843,7 @@ msgstr "SAC"
msgid "SDE file"
msgstr "SDE Datoteka"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Kršenje sigurnosne stanke"
@@ -824,28 +851,30 @@ msgstr "Kršenje sigurnosne stanke"
msgid "Sat"
msgstr "Sub"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Spremi kao..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Spremi promjene?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Spremi datoteku kao"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Spremi..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Odaberi događaje"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Odaberi događaje..."
#: main.c:47
@@ -860,28 +889,32 @@ msgstr ""
"Greška pri pisanju u datoteku req.txt\n"
"Je li Uemis Zurich ispravno prikopčan?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Najkraći uron"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Prikaži stupce"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Veličina"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarm: Brzina"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Upozorenje: Brzina"
@@ -889,15 +922,15 @@ msgstr "Upozorenje: Brzina"
msgid "Start"
msgstr "Početak"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Statistika"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Statistika"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Odijelo"
@@ -906,35 +939,39 @@ msgstr "Odijelo"
msgid "Sun"
msgstr "Ned"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Površinski interval"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Tablični ispis"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Preporučena izmjena boce"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Podaci od pritisku u boci"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temp"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Temperatura"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Temperatura:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Tri"
@@ -942,25 +979,25 @@ msgstr "Tri"
msgid "Thu"
msgstr "Čet"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Vrijeme"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Uključi/isključi povećanje"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Ukupno"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Ukupno trajanje"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -995,11 +1032,11 @@ msgstr ""
"Iskopčajte i ponovo ukopčajte uređaj\n"
"i pokušajte ponovo"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Uemis greška pri inicijalizaciji"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr ""
@@ -1008,24 +1045,28 @@ msgstr ""
msgid "Unable to create parser for %s %s"
msgstr ""
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, fuzzy, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Nije uspjelo otvaranje %i datoteka"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Jedinice"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Pregled"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Zapremnina:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Temperatura vode"
@@ -1033,7 +1074,7 @@ msgstr "Temperatura vode"
msgid "Wed"
msgstr "Sri"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Težina"
@@ -1041,23 +1082,23 @@ msgstr "Težina"
msgid "Weight System"
msgstr "Težina"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Težina:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML datoteka"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Godina"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Godišnje statistike"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1065,7 +1106,7 @@ msgstr ""
"Imate promjena koje nisu spremljene\n"
"Želite li ih spremiti prije zatvaranja datoteke?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1074,7 +1115,7 @@ msgstr ""
"Imate promjena koje nisu spremljene u datoteci: %s \n"
"Želite li ih spremiti prije zatvaranja datoteke?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "zrak"
@@ -1106,7 +1147,7 @@ msgstr "pojas"
msgid "bookmark"
msgstr ""
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr ""
@@ -1122,7 +1163,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr ""
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr ""
@@ -1134,7 +1175,7 @@ msgstr ""
msgid "divetime"
msgstr ""
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1154,7 +1195,7 @@ msgstr "integrirani"
msgid "invalid event number"
msgstr ""
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1162,11 +1203,11 @@ msgstr "kg"
msgid "l"
msgstr ""
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "US funte"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr ""
@@ -1175,16 +1216,16 @@ msgstr ""
msgid "maxdepth"
msgstr "Maks. dubina"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr ""
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "više od %d dana"
@@ -1193,6 +1234,22 @@ msgstr "više od %d dana"
msgid "none"
msgstr ""
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr ""
@@ -1230,7 +1287,7 @@ msgid "tissue level warning"
msgstr ""
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr "Ivan Habunek"
@@ -1242,7 +1299,7 @@ msgstr ""
msgid "unkn"
msgstr "nepoznat"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "nepoznato"
@@ -1265,6 +1322,12 @@ msgstr ""
#~ msgid "About"
#~ msgstr "O programu"
+#~ msgid "Delete"
+#~ msgstr "Obriši"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Obriši uron"
+
#, fuzzy
#~ msgctxt "Depth"
#~ msgid ""
@@ -1274,6 +1337,9 @@ msgstr ""
#~ "Prosječna\n"
#~ "dubina"
+#~ msgid "Device name"
+#~ msgstr "Naziv uređaja"
+
#, fuzzy
#~ msgctxt "Duration"
#~ msgid ""
@@ -1283,6 +1349,9 @@ msgstr ""
#~ "Ukupno\n"
#~ "Trajanje"
+#~ msgid "Pretty print"
+#~ msgstr "Lijep ispis"
+
#, fuzzy
#~ msgctxt "SAC"
#~ msgid ""
diff --git a/po/it_IT.po b/po/it_IT.po
index b6900a0..018a1a8 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-20 16:23+0100\n"
"Last-Translator: Filippo Moser <filippom at gmail.com>\n"
"Language-Team: Italian\n"
@@ -18,20 +18,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Mese"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Selezionare il computer e la periferica"
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "#"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -43,59 +43,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s %4$d. %3$s %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) oder (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr ""
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Aggiungi Immersione..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Aggiungi immersione"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Aggiungi al viaggio sopra"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Temperatura Media"
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "Apr"
@@ -104,90 +126,90 @@ msgstr "Apr"
msgid "Aug"
msgstr "Ago"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Raggruppa"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Raggruppa automaticamente immersioni in viaggi"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Media"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Media"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Media"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Media"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Profondità media"
# surface air consumption (SAC)
# consumo d'aria in superficie (CAS)
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "CAS Medio"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Temperatura Media"
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Tempo Medio"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "Bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Compagno"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Selezionare il file XML di default"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Selezionare i files XML da importare nel file dei dati"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Chiudi"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Minimizza tutto"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Crea un nuovo viaggio sopra"
# Cubic foot
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "Piedi cubi"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Bombola"
@@ -199,15 +221,15 @@ msgstr "Bombola"
msgid "Cylinders"
msgstr "Bombole"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Data"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Data e Tempo"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Data:"
@@ -215,46 +237,38 @@ msgstr "Data:"
msgid "Dec"
msgstr "Dic"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "File XML di default"
-#: info.c:256
-msgid "Delete"
-msgstr "Cancella"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Cancella Immersione"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Cancella immersione"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Cancella immersioni"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Profondità"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Profondità (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Limite Profondità Superato"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Profondità:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Nome periferica"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -272,103 +286,103 @@ msgstr "Immersione #%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Immersione #%d: %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Informazioni sull'immersione"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Note dell'immersione"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Tempo d'Immersione"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Allarme: Tempo d'Immersione"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Info: Tempo d'Immersione"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Computer"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr ""
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Dettagli immersione"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Dive master"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Immersione n."
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Carattere Immersione"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Immersioni"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Scarica dal Computer"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Scarica dal Computer..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Durata"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Durata (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Modifica"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Modifica Informazioni Viaggio"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Modifica Riepilogo Viaggio"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Modifica Immersione"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Modifica Immersioni"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Modifica più immerisoni"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Modifica il riepilogo di viaggio"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Abilita / Disabilita Eventi"
@@ -376,10 +390,14 @@ msgstr "Abilita / Disabilita Eventi"
msgid "End"
msgstr "Fine"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Attrezzatura"
+#: libdivecomputer.c:289
+msgid "Error obtaining water salinity"
+msgstr ""
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr ""
@@ -388,7 +406,7 @@ msgstr ""
msgid "Error parsing the divetime"
msgstr ""
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr ""
@@ -400,11 +418,11 @@ msgstr ""
msgid "Error parsing the maxdepth"
msgstr ""
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr ""
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr ""
@@ -412,48 +430,48 @@ msgstr ""
msgid "Error registering the data"
msgstr ""
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr ""
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr ""
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr ""
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Espandi tutto"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Impossibile aprire i file %i"
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Impossibile analizzare '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Impossibile analizzare '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Impossibile leggere '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Impossibile leggere '%s'.\n"
@@ -462,23 +480,27 @@ msgstr "Impossibile leggere '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "Piedi"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "File"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filtro"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Ven"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Gas Usato"
@@ -486,15 +508,19 @@ msgstr "Gas Usato"
msgid "Gasmix"
msgstr "Miscela di gas"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Aiuto"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Importa file(s) XML..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Informazioni"
@@ -511,40 +537,40 @@ msgstr "Lug"
msgid "Jun"
msgstr "Giu"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel e altri, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Lista"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "Litri"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Luogo"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Log"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Più lunga"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Immersione più lunga"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Allarme: Batteria scarica"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Avviso: Batteria Scarica"
@@ -552,31 +578,31 @@ msgstr "Avviso: Batteria Scarica"
msgid "Mar"
msgstr "Mar"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Marcatore"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Master"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Avviso: Massimo tempo di decompressione"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Profondità Massima"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "CAS Massimo"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Temperatura Massima"
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -591,17 +617,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Pressione Massima"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Massimo"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Massimo"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Massimo"
@@ -610,46 +636,51 @@ msgstr "Massimo"
msgid "May"
msgstr "Mag"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Cancella immersioni"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Raggruppa il viaggio con il viaggio sopra"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Raggruppa il viaggio con il viaggio sotto"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "Metro"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Profondità Minima"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Min. CAS"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Temperatura Minima"
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimo"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimo"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimo"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Opzioni"
@@ -657,23 +688,23 @@ msgstr "Opzioni"
msgid "Mon"
msgstr "Lun"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Programma Multi-piattaforma in C per il log delle immersioni"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Nuovo"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Nuovo numero di inizio"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Nessun dato sulla bombola"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Note"
@@ -685,7 +716,7 @@ msgstr "Nov"
msgid "OLF"
msgstr ""
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -693,15 +724,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "Ott"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr ""
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Apri File"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Apri..."
@@ -709,27 +740,27 @@ msgstr "Apri..."
msgid "PO2"
msgstr ""
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Allarme Incremento PO2"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Avviso Incremento PO2"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Avviso PO2 Verde"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Preferenze"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Preferenze..."
@@ -737,82 +768,78 @@ msgstr "Preferenze..."
msgid "Pressure"
msgstr "Pressione"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Pressione:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Stampa Formattata"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Stampa solo le immersioni selezionate"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Stampa selezione"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Stampa tipo"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Stampa..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profilo"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Esci"
# remaining gas time (RGT)
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Allarme RGT"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Avviso RGT"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Valutazione"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Lettura immersione %s in corso"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Rimuovi Viaggio"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Rimuovi immersione dal viaggio"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Rimuovi le immersioni selezionate dal viaggio"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Rinumera"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Rinumera..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Riprova"
# SAC surface air consumption
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "CAS"
@@ -820,7 +847,7 @@ msgstr "CAS"
msgid "SDE file"
msgstr "SDE File"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Violazione della tappa di sicurezza"
@@ -828,28 +855,30 @@ msgstr "Violazione della tappa di sicurezza"
msgid "Sat"
msgstr "Sab"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Salva Come..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Salvare le modifiche?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Salvare il File come"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Salva..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Seleziona Eventi"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Seleziona Eventi..."
#: main.c:47
@@ -864,28 +893,32 @@ msgstr ""
"Scrittura breve sul file req.txt\n"
"Lo Uemis Zurich e' collegato correttamente?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Più corto"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Immersione più corta"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Visualizza Colonne"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Dimensione"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Allarme Risalita Veloce"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Avviso Risalita Veloce"
@@ -893,15 +926,15 @@ msgstr "Avviso Risalita Veloce"
msgid "Start"
msgstr "Inizio"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Statistiche"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Statistiche"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Muta"
@@ -910,35 +943,39 @@ msgstr "Muta"
msgid "Sun"
msgstr "Dom"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Intervallo di Superficie"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Stampa Tabella"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Suggerito Cambio Bombola"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Informazione Pressione della bombola"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temperatura"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Temperatura"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Temperatura:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Albero"
@@ -946,25 +983,25 @@ msgstr "Albero"
msgid "Thu"
msgstr "Gio"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Tempo"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Zoom Alternativo"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Totale"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Tempo Totale"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -999,11 +1036,11 @@ msgstr ""
"Disconnettere/connettere il computer\n"
"e riprovare"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Impossibile inizializzare l'Uemis"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr ""
@@ -1012,24 +1049,28 @@ msgstr ""
msgid "Unable to create parser for %s %s"
msgstr ""
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, fuzzy, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Impossibile aprire i file %i"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Unità"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Visualizza"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Volume:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Temperatura dell'acqua"
@@ -1037,7 +1078,7 @@ msgstr "Temperatura dell'acqua"
msgid "Wed"
msgstr "Mer"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Peso"
@@ -1045,23 +1086,23 @@ msgstr "Peso"
msgid "Weight System"
msgstr "Sistema di Zavorra"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Peso:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "File XML"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Anno"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Statistiche Annuali"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1069,7 +1110,7 @@ msgstr ""
"Non hai salvato le modifiche.\n"
"Vuoi salvare prima di chiudere il file dei dati?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1078,7 +1119,7 @@ msgstr ""
"Non hai salvato le modifiche al file %s.\n"
"Vuoi salvare prima di chiudere il file dei dati?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "aria"
@@ -1110,7 +1151,7 @@ msgstr "cintura"
msgid "bookmark"
msgstr ""
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr ""
@@ -1126,7 +1167,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "piedi cubi"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr ""
@@ -1138,7 +1179,7 @@ msgstr ""
msgid "divetime"
msgstr ""
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1158,7 +1199,7 @@ msgstr "integrato"
msgid "invalid event number"
msgstr ""
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1166,11 +1207,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "lbs"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1179,16 +1220,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "Profondità Massima"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr ""
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "più di %d giorni"
@@ -1197,6 +1238,22 @@ msgstr "più di %d giorni"
msgid "none"
msgstr ""
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "pascal"
@@ -1234,7 +1291,7 @@ msgid "tissue level warning"
msgstr ""
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr "Filippo Moser"
@@ -1246,7 +1303,7 @@ msgstr ""
msgid "unkn"
msgstr "sconosciuto"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "sconosciuto"
@@ -1268,3 +1325,15 @@ msgstr ""
#~ msgid "About"
#~ msgstr "Informazioni"
+
+#~ msgid "Delete"
+#~ msgstr "Cancella"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Cancella Immersione"
+
+#~ msgid "Device name"
+#~ msgstr "Nome periferica"
+
+#~ msgid "Pretty print"
+#~ msgstr "Stampa Formattata"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 7d8391d..c7bf1bc 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-22 08:01+0100\n"
"Last-Translator: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>\n"
"Language-Team: Norwegian Bokmål\n"
@@ -19,20 +19,20 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Måned"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Velg dykkecomputer og enhet"
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "#"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -44,59 +44,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s, %4$d. %3$s %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s. %3$d. %2$s %4$d %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s. %3$d. %2$s %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s. %3$d. %2$s %4$d %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dt %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dt %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) eller (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "Om Subsurface"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Nytt dykk..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Nytt dykk"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Slå sammen med turen over"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Snitt-temp."
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "apr"
@@ -105,87 +127,87 @@ msgstr "apr"
msgid "Aug"
msgstr "aug"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Grupper automatisk"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Grupper dykk som turer automatisk"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Snittdybde"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Snitt-SAC"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Snitt-temp."
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Snitt-tid"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Buddy"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Velg standard XML-fil"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Velg hvilke XML-filer du vil importere"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Lukk"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Slå sammen alle"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Lag ny tur over denne"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "ft³"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Flaske"
@@ -197,15 +219,15 @@ msgstr "Flaske"
msgid "Cylinders"
msgstr "Flasker"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Dato"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Dato og tid"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Dato:"
@@ -213,46 +235,38 @@ msgstr "Dato:"
msgid "Dec"
msgstr "des"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Standard XML-fil"
-#: info.c:256
-msgid "Delete"
-msgstr "Slett"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Slett dykk"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Slett dykk"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Slett dykk"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Dybde"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Dybde (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Maksgrense for dybde overskredet"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Dybde:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Enhetsnavn"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -270,103 +284,103 @@ msgstr "Dykk #%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Dykk #%d: %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Informasjon"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Dykk"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Starttid"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Alarm: dykketid"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Info: dykketid"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Dykkecomputer"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Feil ved import av dykkedata"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Detaljer"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Dykkeleder"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Dykk nr."
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Skrifttype for liste"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Dykkeleder"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Dykk"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Last ned fra dykkecomputer"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Last ned fra dykkecomputer..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Varighet"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Varighet (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Rediger"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Rediger turinformasjon"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Rediger tursammendrag"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Rediger dykk"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Rediger dykk"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Rediger flere dykk"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Rediger tursammendrag"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Skru på/av hendelser"
@@ -374,10 +388,15 @@ msgstr "Skru på/av hendelser"
msgid "End"
msgstr "Slutt"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Utstyr"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Feil ved lesing av detaljer"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Feil ved lesing av dato"
@@ -386,7 +405,7 @@ msgstr "Feil ved lesing av dato"
msgid "Error parsing the divetime"
msgstr "Feil ved lesing av dykketid"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Feil ved lesing av gassmiks"
@@ -398,11 +417,11 @@ msgstr "Feil ved lesing av gassmiksantall"
msgid "Error parsing the maxdepth"
msgstr "Feil ved lesing av maksdybde"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Feil ved lesing av detaljer"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Feil ved registrering av avbruddshåndterer."
@@ -410,48 +429,48 @@ msgstr "Feil ved registrering av avbruddshåndterer."
msgid "Error registering the data"
msgstr "Feil ved registrering av data"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Feil ved registrering av hendelseshåndterer."
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Hendelse: systime%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Hendelse: Venter på bruker"
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Ekspander alle"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Fikk ikke åpnet %i filer."
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Kunne ikke lese '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Kunne ikke lese '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Kunne ikke åpne '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Kunne ikke åpne '%s'.\n"
@@ -460,23 +479,27 @@ msgstr "Kunne ikke åpne '%s'.\n"
msgid "Feb"
msgstr "feb"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "fot"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Fil"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filter"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "fre"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Gass brukt"
@@ -484,15 +507,19 @@ msgstr "Gass brukt"
msgid "Gasmix"
msgstr "Gassmiks"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Hjelp"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Importer XML-fil(er)..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Info"
@@ -509,40 +536,40 @@ msgstr "jul"
msgid "Jun"
msgstr "jun"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel med flere, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "liter"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Sted"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Logg"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Lengste"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Lengste dykk"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Alarm: dårlig batteri"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Advarsel: dårlig batteri"
@@ -550,31 +577,31 @@ msgstr "Advarsel: dårlig batteri"
msgid "Mar"
msgstr "mar"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "markering"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "master"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Advarsel: maks dekotid"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Maks. dybde"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Maks. SAC"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Maks. temp."
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -589,17 +616,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Maks. trykk"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Maksimum"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Maksimum"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Maksimum"
@@ -608,46 +635,51 @@ msgstr "Maksimum"
msgid "May"
msgstr "mai"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Slett dykk"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Slå samme tur med turen over"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Slå sammen tur med turen under"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "meter"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Min. dybde"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Min. temp"
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Ymse valg"
@@ -655,23 +687,23 @@ msgstr "Ymse valg"
msgid "Mon"
msgstr "man"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Dykkelogg i C for flere plattformer"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Ny"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Nytt startnummer"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Ingen tankinformasjon"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Notater"
@@ -683,7 +715,7 @@ msgstr "nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -691,15 +723,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "okt"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Feil ved retur fra pthread"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Åpne fil"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Åpne..."
@@ -707,27 +739,27 @@ msgstr "Åpne..."
msgid "PO2"
msgstr "PO2"
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Alarm: oppstigning / PO2"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Advarsel: oppstigning /PO2"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Advarsel: grønn / PO2"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Valg"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Valg..."
@@ -735,80 +767,76 @@ msgstr "Valg..."
msgid "Pressure"
msgstr "Trykk"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Trykk:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Pen utskrift"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Skriv ut valgte dykk"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Skriv ut valg"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Utskriftstype"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Skriv ut..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Avslutt"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Alarm: gjenværende gasstid"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Advarsel: gjenværende gasstid"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Vurdering"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Leser dykk %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Fjern tur"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Fjern dykk fra tur"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Fjern valgte dykk fra tur"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Oppdater nummerering"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Oppdater nummerering..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Prøv igjen"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "SAC"
@@ -816,7 +844,7 @@ msgstr "SAC"
msgid "SDE file"
msgstr "SDE-fil"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Brudd på sikkerhetsstopp"
@@ -824,28 +852,30 @@ msgstr "Brudd på sikkerhetsstopp"
msgid "Sat"
msgstr "lør"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Lagre som..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Lagre endringer?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Lagre fil som"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Lagre..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Velg hendelser"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Velg hendelser..."
#: main.c:47
@@ -860,28 +890,32 @@ msgstr ""
"Fikk ikke skrevet ferdig req.txt\n"
"Er Uemis Zurich plugget i ordentlig?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Korteste"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Korteste dykk"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Vis kolonner"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Størrelse"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarm: oppstigningshastighet"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Advarsel: oppstigningshastighet"
@@ -889,15 +923,15 @@ msgstr "Advarsel: oppstigningshastighet"
msgid "Start"
msgstr "Start"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Statistikk"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Statistikk"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Drakt"
@@ -906,35 +940,39 @@ msgstr "Drakt"
msgid "Sun"
msgstr "søn"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Overflateintervall"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Tabellutskrift"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Tankbytte foreslått"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Info: trykk"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temp"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Temperatur:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Alle"
@@ -942,25 +980,25 @@ msgstr "Alle"
msgid "Thu"
msgstr "tor"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Tid"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Zoom av/på"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Total tid"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -995,11 +1033,11 @@ msgstr ""
"Koble fra og til dykkecomputeren\n"
"og prøv igjen"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Klarer ikke å lese fra Uemis"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "Kunne ikke opprette kontekst for libdivecomputer"
@@ -1008,24 +1046,28 @@ msgstr "Kunne ikke opprette kontekst for libdivecomputer"
msgid "Unable to create parser for %s %s"
msgstr "Kunne ikke lage parser for %s %s"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Fikk ikke åpnet %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Enheter"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Vis"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Volum:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Vanntemperatur"
@@ -1033,7 +1075,7 @@ msgstr "Vanntemperatur"
msgid "Wed"
msgstr "ons"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Vekt"
@@ -1041,23 +1083,23 @@ msgstr "Vekt"
msgid "Weight System"
msgstr "Vektsystem"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Vekt:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML-fil"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "År"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Årsstatistikk"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1065,7 +1107,7 @@ msgstr ""
"Du har endringer som ikke er lagret.\n"
"Vil du lagre disse før du lukker datafila?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1074,7 +1116,7 @@ msgstr ""
"Du har endringer som ikke er lagret i %s.\n"
"Vil du lagre disse før du lukker fila?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "luft"
@@ -1106,7 +1148,7 @@ msgstr "belte"
msgid "bookmark"
msgstr "bokmerke"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "tak"
@@ -1122,7 +1164,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "ft³"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "deko"
@@ -1134,7 +1176,7 @@ msgstr "dypstopp"
msgid "divetime"
msgstr "dykketid"
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1154,7 +1196,7 @@ msgstr "integrert"
msgid "invalid event number"
msgstr "ugyldig hendelsesnummer"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1162,11 +1204,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "pund"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1174,16 +1216,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "maksdybde"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "Min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "mer enn %d dager"
@@ -1192,6 +1234,22 @@ msgstr "mer enn %d dager"
msgid "none"
msgstr "ingen"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "pascal"
@@ -1229,7 +1287,7 @@ msgid "tissue level warning"
msgstr "Advarsel: nivå i vev"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr "Henrik Brautaset Aronsen"
@@ -1241,7 +1299,7 @@ msgstr "sender"
msgid "unkn"
msgstr "ukjent"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "ukjent"
@@ -1264,6 +1322,12 @@ msgstr "arbeidsbelastning"
#~ msgid "About"
#~ msgstr "Om"
+#~ msgid "Delete"
+#~ msgstr "Slett"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Slett dykk"
+
#, fuzzy
#~ msgctxt "Depth"
#~ msgid ""
@@ -1273,6 +1337,9 @@ msgstr "arbeidsbelastning"
#~ "Dybde\n"
#~ "Gjennomsnitt"
+#~ msgid "Device name"
+#~ msgstr "Enhetsnavn"
+
#, fuzzy
#~ msgctxt "Duration"
#~ msgid ""
@@ -1282,6 +1349,9 @@ msgstr "arbeidsbelastning"
#~ "Varighet\n"
#~ "Total"
+#~ msgid "Pretty print"
+#~ msgstr "Pen utskrift"
+
#, fuzzy
#~ msgctxt "SAC"
#~ msgid ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 7e1c173..f5b5d95 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-28 20:24+0100\n"
"Last-Translator: Reinout Hoornweg <reinout at xs4all.nl>\n"
"Language-Team: Dutch\n"
@@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Maand"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Selecteer duikcomputer en aansluiting. "
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "Nr."
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -44,59 +44,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s %4$d %3$s %5$d %6$02d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s %3$d %2$s %4$d %5$02d:%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s %3$d %2$s %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s %3$d %2$s %4$d %5$02d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %du %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%du %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) of (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "Over Subsurface"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Duik toevoegen..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Duik Toevoegen"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Trip hierboven toevoegen"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Gem. temp."
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "apr"
@@ -105,87 +127,87 @@ msgstr "apr"
msgid "Aug"
msgstr "aug"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Automatisch groeperen"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Automatisch de duiken in trips groeperen"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Gem. diepte"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Gem. gasverbruik"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Gem. temp."
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Gem. tijd"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Buddy"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Kies standaard XML bestand"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Kies de XML bestanden om te importeren in huidig data bestand"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Sluiten"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Alles inklappen"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Nieuwe trip hierboven invoegen"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Fles"
@@ -197,15 +219,15 @@ msgstr "Fles"
msgid "Cylinders"
msgstr "Flessen"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Datum"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Datum en tijd"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Datum:"
@@ -213,46 +235,38 @@ msgstr "Datum:"
msgid "Dec"
msgstr "dec"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Standaard XML bestand"
-#: info.c:256
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Duik verwijderen"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Duik verwijderen"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Duiken verwijderen"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Diepte"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Diepte (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Dieptelimiet overschreden"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Diepte:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Apparaatnaam"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -270,103 +284,103 @@ msgstr "Duik nr. %d - "
msgid "Dive %d: %s %d %04d"
msgstr "Duik nr. %d: %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Duikinformatie"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Duiknotities"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Duiktijd"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Alarm: Duiktijd"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Info: Duiktijd"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Duikcomputer"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Fout bij importeren van duikdata"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Duikdetails"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Duikleider"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Duik nr."
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Duiklijst font"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Duikleider"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Duiken"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Download uit duikcomputer"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Download uit duikcomputer..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Duur"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Duur (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Bewerken"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Trip informatie bewerken"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Trip overzicht bewerken"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Duik bewerken"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Duiken bewerken"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Bewerk meerdere duiken"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Trip overzicht bewerken"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "In-/uitschakelen gebeurtenissen"
@@ -374,10 +388,15 @@ msgstr "In-/uitschakelen gebeurtenissen"
msgid "End"
msgstr "Einde"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Uitrusting"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Fout bij het verwerken van de samples"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Fout bij verwerken van de datum en tijd"
@@ -386,7 +405,7 @@ msgstr "Fout bij verwerken van de datum en tijd"
msgid "Error parsing the divetime"
msgstr "Fout bij verwerken van de duikduur"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Fout bij het verwerken van het gasmengsel"
@@ -398,11 +417,11 @@ msgstr "Fout bij het verwerken van het aantal gasmengsels"
msgid "Error parsing the maxdepth"
msgstr "Fout bij het verwerken van de maximum duikdiepte"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Fout bij het verwerken van de samples"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Fout bij het registreren van de cancellation handler."
@@ -410,48 +429,48 @@ msgstr "Fout bij het registreren van de cancellation handler."
msgid "Error registering the data"
msgstr "Fout bij het registreren van de data"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Fout bij het registreren van de event handler."
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Event: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Event: wachten op handeling van gebruiker"
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Alles uitklappen"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Fout bij openen van %i bestanden."
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Fout bij analyse van '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Fout bij analyseren van '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Fout bij lezen van '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Fout bij lezen van '%s'.\n"
@@ -460,23 +479,27 @@ msgstr "Fout bij lezen van '%s'.\n"
msgid "Feb"
msgstr "feb"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "voet"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Bestand"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filter"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Vr"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Gas verbruikt"
@@ -484,15 +507,19 @@ msgstr "Gas verbruikt"
msgid "Gasmix"
msgstr "Gasmengsel"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Help"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Importeer XML bestand(en)..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Informatie"
@@ -509,40 +536,40 @@ msgstr "jul"
msgid "Jun"
msgstr "jun"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel en anderen, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Lijst"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "liter"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Locatie"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Log"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Langste"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Langste duik"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Alarm: Lege batterij"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Waarschuwing:Lege batterij"
@@ -550,31 +577,31 @@ msgstr "Waarschuwing:Lege batterij"
msgid "Mar"
msgstr "mar"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Markering"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Master"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Waarschuwing: Maximale deco-tijd"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Max. diepte"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Max. gasverbruik"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Max. temp."
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -589,17 +616,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Max. druk"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Grootste"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Grootste"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Grootste"
@@ -608,46 +635,51 @@ msgstr "Grootste"
msgid "May"
msgstr "mei"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Duiken verwijderen"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Trip met bovenstaande samenvoegen"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Trip met onderstaande samenvoegen"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "meter"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Min. diepte"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Min. gasverbruik"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Min. temp."
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Kleinste"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Kleinste"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Kleinste"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Diverse opties"
@@ -655,23 +687,23 @@ msgstr "Diverse opties"
msgid "Mon"
msgstr "Ma"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Multi-platform Duikprogramma in C"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Nieuw"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Nieuw beginnummer"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Geen flesinformatie"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Notities"
@@ -683,7 +715,7 @@ msgstr "nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -691,15 +723,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "okt"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Onbekende pthread foutmelding"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Bestand openen"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Openen..."
@@ -707,27 +739,27 @@ msgstr "Openen..."
msgid "PO2"
msgstr "PO2"
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Alarm: Opstijging / PO2"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Waarschuwing: Opstijging / PO2"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Waarschuwing: PO2 Groen"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Instellingen"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Instellingen..."
@@ -735,80 +767,76 @@ msgstr "Instellingen..."
msgid "Pressure"
msgstr "Druk"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Druk:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Mooi afdrukken"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Alleen geselecteerde duiken afdrukken"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Selectie afdrukken"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Afdruktype"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Afdrukken..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profiel"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Afsluiten"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Alarm: resterende gas-tijd"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Waarschuwing: resterende gas-tijd"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Waardering"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Lezen duik %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Trip verwijderen"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Duik uit trip verwijderen"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Geselecteerde duiken uit trip verwijderen"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Hernummeren"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Hernummeren..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Opnieuw"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "Gas verbruiksratio"
@@ -816,7 +844,7 @@ msgstr "Gas verbruiksratio"
msgid "SDE file"
msgstr "SDE bestand"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "veiligheidsstop overtreding"
@@ -824,28 +852,30 @@ msgstr "veiligheidsstop overtreding"
msgid "Sat"
msgstr "Za"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Opslaan als..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Aanpassingen opslaan?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Bestand opslaan als"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Opslaan..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "gebeurtenissen selecteren"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "gebeurtenissen selecteren..."
#: main.c:47
@@ -860,28 +890,32 @@ msgstr ""
"Gedeeltelijke schrijfvoortgang naar req.txt bestand\n"
"Is de Uemis Zurich correkt aangesloten?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Kortste"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Kortste duik"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Kolommen afbeelden"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Grootte"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarm: snelheid"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Waarschuwing: snelheid"
@@ -889,15 +923,15 @@ msgstr "Waarschuwing: snelheid"
msgid "Start"
msgstr "Start"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Statistieken"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Statistieken"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Pak"
@@ -906,35 +940,39 @@ msgstr "Pak"
msgid "Sun"
msgstr "Zo"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Oppervlaktetijd"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Afdrukken in tabelvorm"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Fleswissel voorgesteld"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Info: Flesdruk"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temperatuur"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Temperatuur"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Temperatuur:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Drie"
@@ -942,25 +980,25 @@ msgstr "Drie"
msgid "Thu"
msgstr "Do"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Tijd"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Zoom in-/uitschakelen"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Totale"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Totale tijd"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -995,11 +1033,11 @@ msgstr ""
"AUB de duikcomputer loskoppellen en weer aansluiten\n"
"en probeer opnieuw"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Uemis niet geïnitialiseerd"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "Kan geen context creëren voor libdivecomputer"
@@ -1008,24 +1046,28 @@ msgstr "Kan geen context creëren voor libdivecomputer"
msgid "Unable to create parser for %s %s"
msgstr "Kan geen parser creëren voor %s %s"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Fout bij openen van %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Eenheden"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Weergave"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Volume:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Watertemperatuur"
@@ -1033,7 +1075,7 @@ msgstr "Watertemperatuur"
msgid "Wed"
msgstr "Wo"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Gewicht"
@@ -1041,23 +1083,23 @@ msgstr "Gewicht"
msgid "Weight System"
msgstr "Gewichtssysteem"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Gewicht:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML bestand"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Jaar"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Jaarlijkse statistieken"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1065,7 +1107,7 @@ msgstr ""
"U heeft onopgeslagen wijzigingen.\n"
"Wilt u deze opslaan voordat u het databestand afsluit?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1074,7 +1116,7 @@ msgstr ""
"U heeft onopgeslagen wijzigingen in bestand: %s \n"
"Wilt u deze opslaan voordat u het databestand afsluit?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "lucht"
@@ -1106,7 +1148,7 @@ msgstr "riem"
msgid "bookmark"
msgstr "bladwijzer"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "plafond"
@@ -1122,7 +1164,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "cuft"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "deco"
@@ -1134,7 +1176,7 @@ msgstr "diepe stop"
msgid "divetime"
msgstr "duiktijd"
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1154,7 +1196,7 @@ msgstr "Geïntegreerd"
msgid "invalid event number"
msgstr "ongeldig event-nummer"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1162,11 +1204,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "US pond"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1174,16 +1216,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "Max. diepte"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "meer dan %d dagen"
@@ -1192,6 +1234,22 @@ msgstr "meer dan %d dagen"
msgid "none"
msgstr "geen"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "Pa"
@@ -1229,7 +1287,7 @@ msgid "tissue level warning"
msgstr "waarschuwing stikstofbelasting"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr ""
"Jacco van Koll\n"
@@ -1243,7 +1301,7 @@ msgstr "zender"
msgid "unkn"
msgstr "onbek"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "onbekend"
@@ -1263,6 +1321,12 @@ msgstr "Gewicht"
msgid "workload"
msgstr "werklast"
+#~ msgid "Delete"
+#~ msgstr "Verwijderen"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Duik verwijderen"
+
#, fuzzy
#~ msgctxt "Depth"
#~ msgid ""
@@ -1272,6 +1336,9 @@ msgstr "werklast"
#~ "Diepte\n"
#~ "Gemiddeld"
+#~ msgid "Device name"
+#~ msgstr "Apparaatnaam"
+
#, fuzzy
#~ msgctxt "Duration"
#~ msgid ""
@@ -1281,6 +1348,9 @@ msgstr "werklast"
#~ "Duur\n"
#~ "Totaal"
+#~ msgid "Pretty print"
+#~ msgstr "Mooi afdrukken"
+
#, fuzzy
#~ msgctxt "SAC"
#~ msgid ""
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 33c3c49..5e92b3f 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-23 22:30+0100\n"
"Last-Translator: Ďoďo Ivanecký <dodo.sk at gmail.com>\n"
"Language-Team: Slovakian\n"
@@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Mesiac"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr "Voľba typu počítača a zariadia. "
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr "#"
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -44,59 +44,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %dh %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dh %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) alebo (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr "O Subsurface"
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Pridať Ponor..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Pridať ponor"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Pridať do akcie vyššie"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Priemerná teplota"
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "Apr"
@@ -105,87 +127,87 @@ msgstr "Apr"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Automatické zgrupovanie"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Automatické zrgupovanie do akcii"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Priemerná hĺbka"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Priemerná spotreba"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Priemerná teplota"
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Priemerný čas"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Partner"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Vyber default XML súbor"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Vyber XML súbor pre import do aktuálneho data súboru"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Zatvoriť"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Zredukovať všetky"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Vytvoriť novú akciu nad"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "kubická stopa"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Fľaša"
@@ -197,15 +219,15 @@ msgstr "Fľaša"
msgid "Cylinders"
msgstr "Fľaše"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Dátum"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Dátum a čas"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Dátum:"
@@ -213,46 +235,38 @@ msgstr "Dátum:"
msgid "Dec"
msgstr "Dec"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Default XML Súbor"
-#: info.c:256
-msgid "Delete"
-msgstr "Zmazať"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Zmazať Ponor"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Zmazať ponor"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Zmazať ponory"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Hĺbka"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Hĺbka (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Prekročená Maximálna Hĺbka"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Hĺbka:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Názov zariadenia"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -270,103 +284,103 @@ msgstr "Ponor #%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Ponor #%d: %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Informácie"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Poznámky"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Čas Ponoru"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Alarm Času Ponoru"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Info: Čas Ponoru"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Počítač"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr "Chyba importu dát"
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Detaily ponoru"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Divemaster"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Ponor č."
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Font pre ponory"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Ponory"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Nahratie údajov z počítača"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Nahratie údajov z počítača..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Dĺžka (min)"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Dĺžka (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Editovať"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Editovať akciu"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Editovať sumár"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Editovať ponor"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Editovať ponory"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Editovať viac ponorov"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Editovať sumár"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Povolit / zakázať udalosti"
@@ -374,10 +388,15 @@ msgstr "Povolit / zakázať udalosti"
msgid "End"
msgstr "Koniec"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Výstroj"
+#: libdivecomputer.c:289
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Chyba spracovania vzoriek"
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr "Chyba spracovania času"
@@ -386,7 +405,7 @@ msgstr "Chyba spracovania času"
msgid "Error parsing the divetime"
msgstr "Chyba spracovania času ponoru"
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr "Chyba spracovania zmesi plynu"
@@ -398,11 +417,11 @@ msgstr "Chyba spracovania dýchacích zmesí"
msgid "Error parsing the maxdepth"
msgstr "Chyba spracovania maximálnej hĺbky"
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr "Chyba spracovania vzoriek"
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr "Chyba registrácie správcu ukončenia"
@@ -410,48 +429,48 @@ msgstr "Chyba registrácie správcu ukončenia"
msgid "Error registering the data"
msgstr "Chyba registrácie dát"
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr "Chyba registrácia správcu udalosti."
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Udalosť: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr "Udalosť: Čakanie na vstup uživateľa"
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Expandovať všetky"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Chyba pri otváraní %i súborov"
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Chyba pri spracovaní '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Chyba pri spracovaní '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Chyba pri načítaní '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Chyba pri načítaní '%s'.\n"
@@ -460,23 +479,27 @@ msgstr "Chyba pri načítaní '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "stopa"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Súbor"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filter"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "Pi"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Použitá zmes"
@@ -484,15 +507,19 @@ msgstr "Použitá zmes"
msgid "Gasmix"
msgstr "Zmes"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Pomoc"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Import XML súboru..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Info"
@@ -509,40 +536,40 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel a ďalší, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Zoznam"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "liter"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Miesto"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Log"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Najdlhší"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Najdlhší ponor"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Alarm: Slabá batéria"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Upozornenie: Slabá batéria"
@@ -550,31 +577,31 @@ msgstr "Upozornenie: Slabá batéria"
msgid "Mar"
msgstr "Mar"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "Značka"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "Master"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Upozornenie: Max. dekompresný čas"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Max. hĺbka"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Max. spotreba"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Max. teplota"
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -589,17 +616,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Max. tlak"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Maximum"
@@ -608,46 +635,51 @@ msgstr "Maximum"
msgid "May"
msgstr "Máj"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Zmazať ponory"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Spoj akciu s akciou nad"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Spoj akciu s akciou pod"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "meter"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Min. hĺbka"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Min. spotreba"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Min. teplota"
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Rôzne voľby"
@@ -655,23 +687,23 @@ msgstr "Rôzne voľby"
msgid "Mon"
msgstr "Po"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Multiplatformový SW na správu ponorov v C"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Nový"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Nové začiatočné číslo"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Žiadne informácie o fľaši"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Poznámky"
@@ -683,7 +715,7 @@ msgstr "Nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -691,15 +723,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr "Nešpecifikovaná PTHREAD chyba"
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Otvoriť súbor"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Otvoriť..."
@@ -707,27 +739,27 @@ msgstr "Otvoriť..."
msgid "PO2"
msgstr "PO2"
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "PO2 Alarm: Výstup"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "PO2 Upozornenie: Výstup"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "PO2 Upozornenie: Zelená"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Nastavenia"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Nastavenia..."
@@ -735,80 +767,76 @@ msgstr "Nastavenia..."
msgid "Pressure"
msgstr "Tlak"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Tlak:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Pekná tlač"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Tlačiť vybrané ponory"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Tlačiť výber"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Druh tlače"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Tlačiť..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Koniec"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Alarm: zostávajúci čas plynu"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Upozornenie: zostávajúci čas plynu"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Rating"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Načítavam ponor %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Vymaž akciu"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Vymaž ponor z akcie"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Vymaž vybrané ponory z akcie"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Prečíslovanie"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Prečíslovanie..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Skús znovu"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "Spotreba plynu"
@@ -816,7 +844,7 @@ msgstr "Spotreba plynu"
msgid "SDE file"
msgstr "SDE súbor"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Nedodržaná bezpečnostná zastávka"
@@ -824,28 +852,30 @@ msgstr "Nedodržaná bezpečnostná zastávka"
msgid "Sat"
msgstr "So"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Uložiť ako..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Uložiť zmeny?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Uložiť súbor ako"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Uložiť..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Voľba udalosti"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Voľba udalosti..."
#: main.c:47
@@ -860,28 +890,32 @@ msgstr ""
"Čiastočný zápis do req.txt súboru\n"
"Je Uemis Zurich korektne pripojený?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Najkratší"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Najkratší ponor"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Zobraz stĺpce"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Veľkosť"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarm: Rýchlosť"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Upozornenie: Rýchlosť"
@@ -889,15 +923,15 @@ msgstr "Upozornenie: Rýchlosť"
msgid "Start"
msgstr "Štart"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Štatistika"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Štatistiky"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Oblek"
@@ -906,35 +940,39 @@ msgstr "Oblek"
msgid "Sun"
msgstr "Ne"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Povrchový interval"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Tlač tabuľky"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Odporúčaná zmena fľaše"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Info: Tlak vo fľaši"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Teplota"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Teplota"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Teplota:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Kombinovaný"
@@ -942,25 +980,25 @@ msgstr "Kombinovaný"
msgid "Thu"
msgstr "Št"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Čas"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Zmeň veľkosť"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Celkový čas"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Celkový čas"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -995,11 +1033,11 @@ msgstr ""
"Odpoj a znovu pripoj počítač\n"
"a skus znovu"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Uemis - inicializácia neúspešná"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr "Problém inicializácie libdivecomputer"
@@ -1008,24 +1046,28 @@ msgstr "Problém inicializácie libdivecomputer"
msgid "Unable to create parser for %s %s"
msgstr "Nie je možné spracovať %s %s"
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Nie je možné otvoriť %s %s (%s)"
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Jednotky"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Náhľad"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Objem:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Teplota vody"
@@ -1033,7 +1075,7 @@ msgstr "Teplota vody"
msgid "Wed"
msgstr "St"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Závažie"
@@ -1041,23 +1083,23 @@ msgstr "Závažie"
msgid "Weight System"
msgstr "Závažie"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Závažie:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML súbor"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr "Rok"
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Ročná štatistika"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1065,7 +1107,7 @@ msgstr ""
"Máš neuložené zmeny.\n"
"Chceš ich uložiť pred zatvorením súboru?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1074,7 +1116,7 @@ msgstr ""
"Máš neuložené zmeny v súbore %s \n"
"Chceš ich uložiť pred zatvorením súboru?"
-#: divelist.c:639
+#: divelist.c:640
msgid "air"
msgstr "vzduch"
@@ -1106,7 +1148,7 @@ msgstr "opasok"
msgid "bookmark"
msgstr "poznámka"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr "strop"
@@ -1122,7 +1164,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr "cuft"
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr "dekompresia"
@@ -1134,7 +1176,7 @@ msgstr "hĺbkový zastávka"
msgid "divetime"
msgstr "čas ponoru"
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1154,7 +1196,7 @@ msgstr "integrované"
msgid "invalid event number"
msgstr "neplatné číslo udalosti"
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1162,11 +1204,11 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "US libra"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr "m"
@@ -1174,16 +1216,16 @@ msgstr "m"
msgid "maxdepth"
msgstr "max. hĺbka"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "viac než %d dní"
@@ -1192,6 +1234,22 @@ msgstr "viac než %d dní"
msgid "none"
msgstr "žiaden"
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr "pascal"
@@ -1229,7 +1287,7 @@ msgid "tissue level warning"
msgstr "upozornenie nasýtenia tkanív"
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr "Jozef Ivanecký"
@@ -1241,7 +1299,7 @@ msgstr "vysielač"
msgid "unkn"
msgstr "nez."
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "neznámy"
@@ -1264,6 +1322,12 @@ msgstr "záťaž"
#~ msgid "About"
#~ msgstr "Info"
+#~ msgid "Delete"
+#~ msgstr "Zmazať"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Zmazať Ponor"
+
#, fuzzy
#~ msgctxt "Depth"
#~ msgid ""
@@ -1273,6 +1337,9 @@ msgstr "záťaž"
#~ "Priemerná\n"
#~ "Hĺbka"
+#~ msgid "Device name"
+#~ msgstr "Názov zariadenia"
+
#, fuzzy
#~ msgctxt "Duration"
#~ msgid ""
@@ -1282,6 +1349,9 @@ msgstr "záťaž"
#~ "Dĺžka\n"
#~ "Celková"
+#~ msgid "Pretty print"
+#~ msgstr "Pekná tlač"
+
#, fuzzy
#~ msgctxt "SAC"
#~ msgid ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 1536319..6cadfc5 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2012-11-12 10:19+0100\n"
"PO-Revision-Date: 2012-10-12 11:48+0900\n"
"Last-Translator: Linus Torvalds <torvalds at linux-foundation.org>\n"
"Language-Team: Swedish\n"
@@ -20,20 +20,20 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: statistics.c:162
+#: statistics.c:164
msgctxt "Stats"
msgid " > Month"
msgstr " > Månad"
-#: gtk-gui.c:1516
+#: gtk-gui.c:1716
msgid " Please select dive computer and device. "
msgstr " Välj dykdator och enhet"
-#: statistics.c:160
+#: statistics.c:162
msgid "#"
msgstr ""
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: statistics.c:561 statistics.c:633 statistics.c:635 statistics.c:637
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
@@ -45,59 +45,81 @@ msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s, %4$d %3$s, %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:242
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s, %3$d %2$s, %4$d %5$dh%6$02d"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:386
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s, %3$d %2$s, %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:531
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s, %3$d %2$s, %4$d %5$2d:%6$02d"
-#: print.c:254 statistics.c:536
+#: print.c:267 statistics.c:538
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:507
+#: statistics.c:509
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %dt %dmin"
-#: statistics.c:509
+#: statistics.c:511
#, c-format
msgid "%dh %dmin"
msgstr "%dt %dmin"
-#: dive.c:618
+#: dive.c:717
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) eller (%s)"
-#: gtk-gui.c:851 gtk-gui.c:923
+#: print.c:543
+msgid "1 dive per page"
+msgstr ""
+
+#: print.c:539
+msgid "6 dives per page"
+msgstr ""
+
+#: gtk-gui.c:955 gtk-gui.c:1027
msgid "About Subsurface"
msgstr ""
-#: gtk-gui.c:917
+#: gtk-gui.c:1021
msgid "Add Dive..."
msgstr "Nytt dyk..."
-#: divelist.c:2023
+#: divelist.c:2168
msgid "Add dive"
msgstr "Nytt dyk"
-#: divelist.c:2102
+#: divelist.c:2251
msgid "Add to trip above"
msgstr "Kombinera med resan ovan"
+#: statistics.c:745
+#, fuzzy
+msgid "Air Temp"
+msgstr "Medel-temp."
+
+#: info.c:541
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: gtk-gui.c:1732
+msgid "Always prefer downloaded dive"
+msgstr ""
+
#: main.c:46
msgid "Apr"
msgstr "apr"
@@ -106,87 +128,87 @@ msgstr "apr"
msgid "Aug"
msgstr "aug"
-#: gtk-gui.c:932
+#: gtk-gui.c:1036
msgid "Autogroup"
msgstr "Gruppera automatiskt"
-#: gtk-gui.c:664
+#: gtk-gui.c:679
msgid "Automatically group dives in trips"
msgstr "Gruppera dyk som resor automatisk"
-#: statistics.c:168
+#: statistics.c:170
msgctxt "Depth"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:165
+#: statistics.c:167
msgctxt "Duration"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:171
+#: statistics.c:173
msgctxt "SAC"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:174
+#: statistics.c:176
msgctxt "Temp"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:692 statistics.c:729
+#: statistics.c:700 statistics.c:737
msgid "Avg Depth"
msgstr "Medeldjup"
-#: statistics.c:700
+#: statistics.c:708
msgid "Avg SAC"
msgstr "Medel-SAC"
-#: statistics.c:675
+#: statistics.c:683
msgid "Avg Temp"
msgstr "Medel-temp."
-#: statistics.c:682
+#: statistics.c:690
msgid "Avg Time"
msgstr "Medel-tid"
-#: gtk-gui.c:592
+#: gtk-gui.c:612
msgid "Bar"
msgstr "bar"
-#: info.c:515 info.c:942 print.c:156
+#: info.c:527 info.c:968 print.c:169
msgid "Buddy"
msgstr "Buddy"
-#: gtk-gui.c:602
+#: gtk-gui.c:622
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:522
+#: gtk-gui.c:533
msgid "Choose Default XML File"
msgstr "Välj standard XML-fil"
-#: gtk-gui.c:1410
+#: gtk-gui.c:1603
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Välj vilka XML-filer du vill importera"
-#: gtk-gui.c:913
+#: gtk-gui.c:1017
msgid "Close"
msgstr "Stäng"
-#: divelist.c:2119
+#: divelist.c:2268
msgid "Collapse all"
msgstr "Sammanslå alla"
-#: divelist.c:2092
+#: divelist.c:2241
msgid "Create new trip above"
msgstr "Ny resa innan"
-#: gtk-gui.c:598
+#: gtk-gui.c:618
msgid "CuFt"
msgstr "ft^3"
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1336 gtk-gui.c:642
msgid "Cyl"
msgstr "Cyl"
@@ -198,15 +220,15 @@ msgstr "Cylinder"
msgid "Cylinders"
msgstr "Cylindrar"
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: divelist.c:1329 print.c:168 statistics.c:728
msgid "Date"
msgstr "Datum"
-#: info.c:807
+#: info.c:833
msgid "Date and Time"
msgstr "Datum och tid"
-#: info.c:817
+#: info.c:843
msgid "Date:"
msgstr "Datum:"
@@ -214,46 +236,38 @@ msgstr "Datum:"
msgid "Dec"
msgstr "dec"
-#: gtk-gui.c:669
+#: gtk-gui.c:684
msgid "Default XML Data File"
msgstr "Standard XML-fil"
-#: info.c:256
-msgid "Delete"
-msgstr "Radera"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Radera dyk"
-
-#: divelist.c:2010
+#: divelist.c:2012 divelist.c:2063 divelist.c:2155
msgid "Delete dive"
msgstr "Radera dyk"
-#: divelist.c:2009
+#: divelist.c:2014 divelist.c:2154
msgid "Delete dives"
msgstr "Radera dyk"
-#: print.c:155 statistics.c:160
+#: print.c:168 statistics.c:162
msgid "Depth"
msgstr "Djup"
-#: info.c:867
+#: info.c:893
#, c-format
msgid "Depth (%s):"
msgstr "Djup (%s):"
-#: uemis.c:161
+#: uemis.c:164
msgid "Depth Limit Exceeded"
msgstr "Maxdjup överskridits"
-#: gtk-gui.c:586
+#: gtk-gui.c:606
msgid "Depth:"
msgstr "Djup:"
-#: gtk-gui.c:1378
-msgid "Device name"
-msgstr "Enhetsnamn"
+#: gtk-gui.c:1563
+msgid "Device or mount point"
+msgstr ""
#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
#: info.c:107
@@ -271,103 +285,103 @@ msgstr "Dyk #%d - "
msgid "Dive %d: %s %d %04d"
msgstr "Dyk #%d: %s %d %04d"
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1250 info.c:725 statistics.c:719
msgid "Dive Info"
msgstr "Information"
-#: gtk-gui.c:1126
+#: gtk-gui.c:1242
msgid "Dive Notes"
msgstr "Dykanteckningar"
-#: statistics.c:721
+#: statistics.c:729
msgid "Dive Time"
msgstr "Dyktid"
-#: uemis.c:167
+#: uemis.c:170
msgid "Dive Time Alert"
msgstr "Dyktidsvarning"
-#: uemis.c:165
+#: uemis.c:168
msgid "Dive Time Info"
msgstr "Dyktidsnot"
-#: gtk-gui.c:1347
+#: gtk-gui.c:1534
msgid "Dive computer"
msgstr "Dykdator"
-#: libdivecomputer.c:373
+#: libdivecomputer.c:386
msgid "Dive data import error"
msgstr ""
-#: print.c:476
+#: print.c:529
msgid "Dive details"
msgstr "Detaljer"
-#: info.c:514
+#: info.c:526
msgid "Dive master"
msgstr "Divemaster"
-#: print.c:155
+#: print.c:168
msgid "Dive#"
msgstr "Dyknr"
-#: gtk-gui.c:652
+#: gtk-gui.c:667
msgid "Divelist Font"
msgstr "Font för dyklistan"
-#: info.c:941
+#: info.c:967
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:672
+#: statistics.c:680
msgid "Dives"
msgstr "Dyk"
-#: gtk-gui.c:1508
+#: gtk-gui.c:1707
msgid "Download From Dive Computer"
msgstr "Ladda ned från dykdator"
-#: gtk-gui.c:916
+#: gtk-gui.c:1020
msgid "Download From Dive Computer..."
msgstr "Ladda ned från dykdator..."
-#: statistics.c:160
+#: statistics.c:162
msgid "Duration"
msgstr "Varaktighet"
-#: info.c:862
+#: info.c:888
msgid "Duration (min)"
msgstr "Varaktighet (min)"
-#: info.c:257
+#: info.c:224
msgid "Edit"
msgstr "Redigera"
-#: info.c:659
+#: info.c:684
msgid "Edit Trip Info"
msgstr "Redigera reseinformation"
-#: divelist.c:2031
+#: divelist.c:2176
msgid "Edit Trip Summary"
msgstr "Redigera resesammandrag"
-#: divelist.c:2007
+#: divelist.c:2152
msgid "Edit dive"
msgstr "Redigera dyk"
-#: divelist.c:2006
+#: divelist.c:2151
msgid "Edit dives"
msgstr "Redigera dyk"
-#: info.c:502
+#: info.c:514
msgid "Edit multiple dives"
msgstr "Redigera flera dyk"
-#: info.c:482
+#: info.c:491
msgid "Edit trip summary"
msgstr "Redigera resesammandrag"
-#: gtk-gui.c:773
+#: gtk-gui.c:877
msgid "Enable / Disable Events"
msgstr "Aktivera / Inaktivera händelser"
@@ -375,10 +389,14 @@ msgstr "Aktivera / Inaktivera händelser"
msgid "End"
msgstr "Slut"
-#: gtk-gui.c:1130 info.c:535
+#: gtk-gui.c:1246 info.c:560
msgid "Equipment"
msgstr "Utrustning"
+#: libdivecomputer.c:289
+msgid "Error obtaining water salinity"
+msgstr ""
+
#: libdivecomputer.c:240
msgid "Error parsing the datetime"
msgstr ""
@@ -387,7 +405,7 @@ msgstr ""
msgid "Error parsing the divetime"
msgstr ""
-#: libdivecomputer.c:286
+#: libdivecomputer.c:298
msgid "Error parsing the gas mix"
msgstr ""
@@ -399,11 +417,11 @@ msgstr ""
msgid "Error parsing the maxdepth"
msgstr ""
-#: libdivecomputer.c:294
+#: libdivecomputer.c:306
msgid "Error parsing the samples"
msgstr ""
-#: libdivecomputer.c:369
+#: libdivecomputer.c:382
msgid "Error registering the cancellation handler."
msgstr ""
@@ -411,48 +429,48 @@ msgstr ""
msgid "Error registering the data"
msgstr ""
-#: libdivecomputer.c:364
+#: libdivecomputer.c:377
msgid "Error registering the event handler."
msgstr ""
-#: libdivecomputer.c:339
+#: libdivecomputer.c:352
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr ""
-#: libdivecomputer.c:325
+#: libdivecomputer.c:338
msgid "Event: waiting for user action"
msgstr ""
-#: divelist.c:2116
+#: divelist.c:2265
msgid "Expand all"
msgstr "Expandera alla"
-#: gtk-gui.c:603
+#: gtk-gui.c:623
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:140
+#: gtk-gui.c:143
#, c-format
msgid "Failed to open %i files."
msgstr "Kunde inte öppna %i filer."
-#: parse-xml.c:1498
+#: parse-xml.c:1499
#, c-format
msgid "Failed to parse '%s'"
msgstr "Kunde inte läsa '%s'"
-#: parse-xml.c:1493
+#: parse-xml.c:1494
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Kunde inte läsa '%s'.\n"
-#: file.c:266
+#: file.c:265
#, c-format
msgid "Failed to read '%s'"
msgstr "Kunde inte öppna '%s'"
-#: file.c:262
+#: file.c:261
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Kunde inte öppna '%s'.\n"
@@ -461,23 +479,27 @@ msgstr "Kunde inte öppna '%s'.\n"
msgid "Feb"
msgstr "feb"
-#: gtk-gui.c:588
+#: gtk-gui.c:608
msgid "Feet"
msgstr "fot"
-#: gtk-gui.c:904
+#: gtk-gui.c:1008
msgid "File"
msgstr "Fil"
-#: gtk-gui.c:907
+#: gtk-gui.c:1011
msgid "Filter"
msgstr "Filter"
+#: gtk-gui.c:1726
+msgid "Force download of all dives"
+msgstr ""
+
#: main.c:37
msgid "Fri"
msgstr "fre"
-#: statistics.c:739
+#: statistics.c:754
msgid "Gas Used"
msgstr "Gasanvändning"
@@ -485,15 +507,19 @@ msgstr "Gasanvändning"
msgid "Gasmix"
msgstr "Gasmix"
-#: gtk-gui.c:908
+#: gtk-gui.c:599
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1012
msgid "Help"
msgstr "Hjälp"
-#: gtk-gui.c:915
+#: gtk-gui.c:1019
msgid "Import XML File(s)..."
msgstr "Importera XML-fil(er)..."
-#: gtk-gui.c:926
+#: gtk-gui.c:1030
msgid "Info"
msgstr "Info"
@@ -510,40 +536,40 @@ msgstr "jul"
msgid "Jun"
msgstr "jun"
-#: gtk-gui.c:857
+#: gtk-gui.c:961
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel med flera, 2011, 2012"
-#: gtk-gui.c:924
+#: gtk-gui.c:1028
msgid "List"
msgstr "Lista"
-#: gtk-gui.c:597
+#: gtk-gui.c:617
msgid "Liter"
msgstr "liter"
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1340 info.c:496 info.c:521 info.c:962 print.c:169
msgid "Location"
msgstr "Plats"
-#: gtk-gui.c:905
+#: gtk-gui.c:1009
msgid "Log"
msgstr "Log"
-#: statistics.c:167
+#: statistics.c:169
msgctxt "Duration"
msgid "Longest"
msgstr "Längsta"
-#: statistics.c:683
+#: statistics.c:691
msgid "Longest Dive"
msgstr "Längsta dyk"
-#: uemis.c:175
+#: uemis.c:178
msgid "Low Battery Alert"
msgstr "Varning: lågt batteri"
-#: uemis.c:173
+#: uemis.c:176
msgid "Low Battery Warning"
msgstr "Varning: lågt batteri"
@@ -551,31 +577,31 @@ msgstr "Varning: lågt batteri"
msgid "Mar"
msgstr "mar"
-#: uemis.c:169
+#: uemis.c:172
msgid "Marker"
msgstr "markering"
-#: print.c:155
+#: print.c:168
msgid "Master"
msgstr "master"
-#: uemis.c:163
+#: uemis.c:166
msgid "Max Deco Time Warning"
msgstr "Varning: max dekotid"
-#: statistics.c:690 statistics.c:728
+#: statistics.c:698 statistics.c:736
msgid "Max Depth"
msgstr "Maxdjup"
-#: statistics.c:698
+#: statistics.c:706
msgid "Max SAC"
msgstr "Max SAC"
-#: statistics.c:673
+#: statistics.c:681
msgid "Max Temp"
msgstr "Max temp"
-#: print.c:95
+#: print.c:99
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -590,17 +616,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Max tryck"
-#: statistics.c:170
+#: statistics.c:172
msgctxt "Depth"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:173
+#: statistics.c:175
msgctxt "SAC"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:176
+#: statistics.c:178
msgctxt "Temp"
msgid "Maximum"
msgstr "Maximum"
@@ -609,46 +635,51 @@ msgstr "Maximum"
msgid "May"
msgstr "maj"
-#: divelist.c:2039
+#: divelist.c:2143
+#, fuzzy
+msgid "Merge dives"
+msgstr "Radera dyk"
+
+#: divelist.c:2184
msgid "Merge trip with trip above"
msgstr "Sammanfoga resa med tidigare resa"
-#: divelist.c:2049
+#: divelist.c:2194
msgid "Merge trip with trip below"
msgstr "Sammanfoga resa med senare resa"
-#: gtk-gui.c:587
+#: gtk-gui.c:607
msgid "Meter"
msgstr "meter"
-#: statistics.c:691
+#: statistics.c:699
msgid "Min Depth"
msgstr "Min. djup"
-#: statistics.c:699
+#: statistics.c:707
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:674
+#: statistics.c:682
msgid "Min Temp"
msgstr "Min. temp"
-#: statistics.c:169
+#: statistics.c:171
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:172
+#: statistics.c:174
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:175
+#: statistics.c:177
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:658
+#: gtk-gui.c:673
msgid "Misc. Options"
msgstr "Diverse inställningar"
@@ -656,23 +687,23 @@ msgstr "Diverse inställningar"
msgid "Mon"
msgstr "mån"
-#: gtk-gui.c:853
+#: gtk-gui.c:957
msgid "Multi-platform divelog software in C"
msgstr "Dyklogg i C for flera platformer"
-#: gtk-gui.c:909
+#: gtk-gui.c:1013
msgid "New"
msgstr "Ny"
-#: gtk-gui.c:813
+#: gtk-gui.c:917
msgid "New starting number"
msgstr "Nytt startnummer"
-#: uemis.c:171
+#: uemis.c:174
msgid "No Tank Data"
msgstr "Ingen tankinformation"
-#: info.c:492 info.c:527 info.c:950
+#: info.c:501 info.c:552 info.c:976
msgid "Notes"
msgstr "Anteckningar"
@@ -684,7 +715,7 @@ msgstr "nov"
msgid "OLF"
msgstr ""
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1339 gtk-gui.c:705 statistics.c:752
msgid "OTU"
msgstr "OTU"
@@ -692,15 +723,15 @@ msgstr "OTU"
msgid "Oct"
msgstr "okt"
-#: libdivecomputer.c:427
+#: libdivecomputer.c:440
msgid "Odd pthread error return"
msgstr ""
-#: gtk-gui.c:315
+#: gtk-gui.c:318
msgid "Open File"
msgstr "Öppna fil"
-#: gtk-gui.c:910
+#: gtk-gui.c:1014
msgid "Open..."
msgstr "Öppna..."
@@ -708,27 +739,27 @@ msgstr "Öppna..."
msgid "PO2"
msgstr ""
-#: uemis.c:149
+#: uemis.c:152
msgid "PO2 Ascend Alarm"
msgstr "Alarm: uppstigning / PO2"
-#: uemis.c:147
+#: uemis.c:150
msgid "PO2 Ascend Warning"
msgstr "Varning: uppstigning / PO2"
-#: uemis.c:144
+#: uemis.c:147
msgid "PO2 Green Warning"
msgstr "Varning: grön PO2"
-#: gtk-gui.c:593
+#: gtk-gui.c:613
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:572
+#: gtk-gui.c:585
msgid "Preferences"
msgstr "Optioner"
-#: gtk-gui.c:918
+#: gtk-gui.c:1022
msgid "Preferences..."
msgstr "Optioner..."
@@ -736,80 +767,76 @@ msgstr "Optioner..."
msgid "Pressure"
msgstr "Tryck"
-#: gtk-gui.c:591
+#: gtk-gui.c:611
msgid "Pressure:"
msgstr "Tryck:"
-#: print.c:486
-msgid "Pretty print"
-msgstr "Prydlig utskrift"
-
-#: print.c:507
+#: print.c:566
msgid "Print only selected dives"
msgstr "Skriv ut valda dyk"
-#: print.c:502
+#: print.c:561
msgid "Print selection"
msgstr "Skriv ut valda dyk"
-#: print.c:480
+#: print.c:533
msgid "Print type"
msgstr "Utskriftstyp"
-#: gtk-gui.c:914
+#: gtk-gui.c:1018
msgid "Print..."
msgstr "Skriv ut..."
-#: gtk-gui.c:925
+#: gtk-gui.c:1029
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:922
+#: gtk-gui.c:1026
msgid "Quit"
msgstr "Avsluta"
-#: uemis.c:157
+#: uemis.c:160
msgid "RGT Alert"
msgstr "Varning: gastid"
-#: uemis.c:155
+#: uemis.c:158
msgid "RGT Warning"
msgstr "Varning: gastid"
-#: info.c:520 info.c:947
+#: info.c:532 info.c:973
msgid "Rating"
msgstr "Ranking"
-#: uemis-downloader.c:267
+#: uemis-downloader.c:446
#, c-format
msgid "Reading dive %s"
msgstr "Läser dyk %s"
-#: divelist.c:2054
+#: divelist.c:1876 divelist.c:2199
msgid "Remove Trip"
msgstr "Radera resa"
-#: divelist.c:2110
+#: divelist.c:2259
msgid "Remove dive from trip"
msgstr "Ta bort dyk från resa"
-#: divelist.c:2108
+#: divelist.c:2257
msgid "Remove selected dives from trip"
msgstr "Ta bort valda dyk från resa"
-#: gtk-gui.c:804
+#: gtk-gui.c:908
msgid "Renumber"
msgstr "Uppdatera numrering"
-#: gtk-gui.c:919
+#: gtk-gui.c:1023
msgid "Renumber..."
msgstr "Uppdatera numrering..."
-#: gtk-gui.c:1485
+#: gtk-gui.c:1678
msgid "Retry"
msgstr "Pröva igen"
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1338 gtk-gui.c:652 statistics.c:162 statistics.c:751
msgid "SAC"
msgstr "SAC"
@@ -817,7 +844,7 @@ msgstr "SAC"
msgid "SDE file"
msgstr "SDE-fil"
-#: uemis.c:137
+#: uemis.c:140
msgid "Safety Stop Violation"
msgstr "Säkerhetsstopp ej uppfyllt"
@@ -825,28 +852,30 @@ msgstr "Säkerhetsstopp ej uppfyllt"
msgid "Sat"
msgstr "lör"
-#: gtk-gui.c:912
+#: gtk-gui.c:1016
msgid "Save As..."
msgstr "Spara som..."
-#: gtk-gui.c:228
+#: gtk-gui.c:231
msgid "Save Changes?"
msgstr "Spara ändringar?"
-#: gtk-gui.c:165
+#: gtk-gui.c:168
msgid "Save File As"
msgstr "Spara fil som"
-#: gtk-gui.c:911
+#: gtk-gui.c:1015
msgid "Save..."
msgstr "Spara..."
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: gtk-gui.c:868
+#, fuzzy
+msgid "Select Events"
msgstr "Välj händelser"
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1025
+#, fuzzy
+msgid "Select Events..."
msgstr "Välj händelser..."
#: main.c:47
@@ -861,28 +890,32 @@ msgstr ""
"Kunde inte skriva filen req.txt\n"
"Är Uemis Zurich ordentligt ansluten?"
-#: statistics.c:166
+#: statistics.c:168
msgctxt "Duration"
msgid "Shortest"
msgstr "Kortaste"
-#: statistics.c:684
+#: statistics.c:692
msgid "Shortest Dive"
msgstr "Kortaste dyk"
-#: gtk-gui.c:611
+#: gtk-gui.c:631 gtk-gui.c:699
msgid "Show Columns"
msgstr "Visa kolumner"
+#: gtk-gui.c:710
+msgid "Show Partial Pressure Graphs in Profile"
+msgstr ""
+
#: equipment.c:959 equipment.c:1494
msgid "Size"
msgstr "Storlek"
-#: uemis.c:139
+#: uemis.c:142
msgid "Speed Alarm"
msgstr "Alarm: uppstigningshastighet"
-#: uemis.c:142
+#: uemis.c:145
msgid "Speed Warning"
msgstr "Varning: uppstigningshastighet"
@@ -890,15 +923,15 @@ msgstr "Varning: uppstigningshastighet"
msgid "Start"
msgstr "Start"
-#: statistics.c:664
+#: statistics.c:672
msgid "Statistics"
msgstr "Statistik"
-#: gtk-gui.c:1138
+#: gtk-gui.c:1254
msgid "Stats"
msgstr "Statistik"
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: divelist.c:1335 gtk-gui.c:662 info.c:533 info.c:974
msgid "Suit"
msgstr "Dräkt"
@@ -907,35 +940,39 @@ msgstr "Dräkt"
msgid "Sun"
msgstr "sön"
-#: statistics.c:722
+#: statistics.c:730
msgid "Surf Intv"
msgstr "Ytintervall"
-#: print.c:490
+#: print.c:547
msgid "Table print"
msgstr "Tabellutskrift"
-#: uemis.c:159
+#: uemis.c:162
msgid "Tank Change Suggested"
msgstr "Tankbyte rekommenderat"
-#: uemis.c:153
+#: uemis.c:156
msgid "Tank Pressure Info"
msgstr "Info: cylindertryck"
-#: gtk-gui.c:617
+#: gtk-gui.c:697
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:637
msgid "Temp"
msgstr "Temp"
-#: statistics.c:160
+#: statistics.c:162
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:601
+#: gtk-gui.c:621
msgid "Temperature:"
msgstr "Temperatur:"
-#: gtk-gui.c:927
+#: gtk-gui.c:1031
msgid "Three"
msgstr "Alla"
@@ -943,25 +980,25 @@ msgstr "Alla"
msgid "Thu"
msgstr "tor"
-#: info.c:822 print.c:155
+#: info.c:848 print.c:168
msgid "Time"
msgstr "Tid"
-#: gtk-gui.c:933
+#: gtk-gui.c:1037
msgid "Toggle Zoom"
msgstr "Zoom av/på"
-#: statistics.c:164
+#: statistics.c:166
msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:681
+#: statistics.c:689
msgid "Total Time"
msgstr "Total tid"
#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:377
#, c-format
msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -996,11 +1033,11 @@ msgstr ""
"Återanslut dykdatorn och försök\n"
"igen"
-#: uemis-downloader.c:559
+#: uemis-downloader.c:782
msgid "Uemis init failed"
msgstr "Kunde inte läsa från Uemis"
-#: libdivecomputer.c:390
+#: libdivecomputer.c:403
msgid "Unable to create libdivecomputer context"
msgstr ""
@@ -1009,24 +1046,28 @@ msgstr ""
msgid "Unable to create parser for %s %s"
msgstr ""
-#: libdivecomputer.c:392
+#: libdivecomputer.c:405
#, fuzzy, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Kunde inte öppna %i filer."
-#: gtk-gui.c:579
+#: gtk-gui.c:600
msgid "Units"
msgstr "Enheter"
-#: gtk-gui.c:906
+#: gtk-gui.c:1010
msgid "View"
msgstr "Visa"
-#: gtk-gui.c:596
+#: info.c:538 statistics.c:738
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:616
msgid "Volume:"
msgstr "Volym:"
-#: statistics.c:730
+#: statistics.c:744
msgid "Water Temp"
msgstr "Vattentemperatur"
@@ -1034,7 +1075,7 @@ msgstr "Vattentemperatur"
msgid "Wed"
msgstr "ons"
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:1020 equipment.c:1620 gtk-gui.c:657
msgid "Weight"
msgstr "Vikt"
@@ -1042,23 +1083,23 @@ msgstr "Vikt"
msgid "Weight System"
msgstr "Viktsystem"
-#: gtk-gui.c:606
+#: gtk-gui.c:626
msgid "Weight:"
msgstr "Vikt:"
-#: gtk-gui.c:153
+#: gtk-gui.c:156
msgid "XML file"
msgstr "XML-fil"
-#: statistics.c:160
+#: statistics.c:162
msgid "Year"
msgstr ""
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1024 statistics.c:370
msgid "Yearly Statistics"
msgstr "Årsstatistik"
-#: gtk-gui.c:238
+#: gtk-gui.c:241
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1066,7 +1107,7 @@ msgstr ""
"Du har ändringer som inte är sparade.\n"
"Vill du spara dem innan du stänger datafilen?"
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:244 gtk-gui.c:247
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1075,7 +1116,7 @@ msgstr ""
"Du har ändringer som inte är sparade i %s.\n"
"Vill du spara dem innan du stänger datafilen?"
-#: divelist.c:639
+#: divelist.c:640
#, fuzzy
msgid "air"
msgstr "bar"
@@ -1108,7 +1149,7 @@ msgstr "bälte"
msgid "bookmark"
msgstr ""
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:187 uemis.c:194
msgid "ceiling"
msgstr ""
@@ -1124,7 +1165,7 @@ msgstr "clip-on"
msgid "cuft"
msgstr ""
-#: libdivecomputer.c:80
+#: libdivecomputer.c:80 uemis.c:189
msgid "deco"
msgstr ""
@@ -1136,7 +1177,7 @@ msgstr ""
msgid "divetime"
msgstr ""
-#: dive.c:113 divelist.c:1264 info.c:867
+#: dive.c:113 divelist.c:1331 info.c:893
msgid "ft"
msgstr "ft"
@@ -1156,7 +1197,7 @@ msgstr "integrerat"
msgid "invalid event number"
msgstr ""
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: dive.c:136 equipment.c:1045 gtk-gui.c:627
msgid "kg"
msgstr "kg"
@@ -1164,11 +1205,11 @@ msgstr "kg"
msgid "l"
msgstr ""
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:132 divelist.c:1334 equipment.c:1047 gtk-gui.c:628
msgid "lbs"
msgstr "pund"
-#: dive.c:108 info.c:867
+#: dive.c:108 info.c:893
msgid "m"
msgstr ""
@@ -1177,16 +1218,16 @@ msgstr ""
msgid "maxdepth"
msgstr "Maxdjup"
-#: divelist.c:1265
+#: divelist.c:1332
msgid "min"
msgstr "Min"
-#: libdivecomputer.c:333
+#: libdivecomputer.c:346
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr ""
-#: statistics.c:501
+#: statistics.c:503
#, c-format
msgid "more than %d days"
msgstr "mer än %d dagar"
@@ -1195,6 +1236,22 @@ msgstr "mer än %d dagar"
msgid "none"
msgstr ""
+#: gtk-gui.c:752
+msgid "pHe"
+msgstr ""
+
+#: gtk-gui.c:757
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:735 gtk-gui.c:740
+msgid "pN"
+msgstr ""
+
+#: gtk-gui.c:718 gtk-gui.c:723
+msgid "pO"
+msgstr ""
+
#: dive.c:41
msgid "pascal"
msgstr ""
@@ -1232,7 +1289,7 @@ msgid "tissue level warning"
msgstr ""
#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:963
msgid "translator-credits"
msgstr "Linus Torvalds"
@@ -1244,7 +1301,7 @@ msgstr ""
msgid "unkn"
msgstr "okänd"
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:83 statistics.c:543
msgid "unknown"
msgstr "okänd"
@@ -1267,3 +1324,15 @@ msgstr ""
#~ msgid "About"
#~ msgstr "Om"
+
+#~ msgid "Delete"
+#~ msgstr "Radera"
+
+#~ msgid "Delete Dive"
+#~ msgstr "Radera dyk"
+
+#~ msgid "Device name"
+#~ msgstr "Enhetsnamn"
+
+#~ msgid "Pretty print"
+#~ msgstr "Prydlig utskrift"
--
1.7.11.5
More information about the subsurface
mailing list