Big translation update

This enables all languages for the moment - let's see if we can get them all ready for the 3.1 release. It also fixes the use of \% instead of %% in one of the strings. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
author: Dirk Hohndel <dirk@hohndel.org> 2013-04-30 10:13:31 -0700
committer: Dirk Hohndel <dirk@hohndel.org> 2013-04-30 11:01:13 -0700
commit: 2af4014c1e68d9045f37af3c601d550ab6b9723f (patch)
tree: 8ed65e11a61f92aad63a99697d2e7cc6779072b7 /po
parent: 172982b86038812e8914d1017c910168cf80e640 (diff)
download: subsurface-2af4014c1e68d9045f37af3c601d550ab6b9723f.tar.gz
23 files changed, 19722 insertions, 7982 deletions
diff --git a/po/bg_BG.po b/po/bg_BG.po
index af3375bd7..b4f5e9466 100644
--- a/po/bg_BG.po
+++ b/po/bg_BG.po
@@ -1,38 +1,35 @@
-# Bulgarian translations for Subsurface package
-# Bugarian messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-#
-# Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# neolit123 <neolit123@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2012-11-10 16:27+0300\n"
-"Last-Translator: Lubomir I. Ivanov <neolit123@gmail.com>>\n"
-"Language-Team: Bulgarian\n"
-"Language: de\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/subsurface/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Няма събития\n"
+msgstr "\nНяма събития\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Месец"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr " Изтегли"
 
@@ -40,17 +37,17 @@ msgstr " Изтегли"
 msgid " Please select dive computer and device. "
 msgstr " Моля изберете леководолазен компютър и устройство. "
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr " начало"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr " край"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "№"
 
@@ -64,52 +61,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/мин"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s от %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d мин"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dд %dч %dмин"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dч %dмин"
@@ -119,185 +117,167 @@ msgstr "%dч %dмин"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"таван %.0f %s"
+msgstr "%s\nтаван %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Деко:%uмин @ %.0f %s"
+msgstr "%s\nДеко:%uмин @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Деко:неопр. време @ %.0f %s"
+msgstr "%s\nДеко:неопр. време @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"В деко"
+msgstr "%s\nВ деко"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Стоп:%uмин @ %.0f %s"
+msgstr "%s\nСтоп:%uмин @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Стоп:неопр. време @ %.0f %s"
+msgstr "%s\nСтоп:неопр. време @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface планиране\n"
-"базирано на GFlow = %.0f и GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface планиране\nбазирано на GFlow = %.0f и GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fбара"
+msgstr "%s\npHe:%.2fбара"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fбара"
+msgstr "%s\npN%s:%.2fбара"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fбара"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
 msgstr ""
-"%s\n"
-"pO%s:%.2fбара"
 
-#: dive.c:918
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) или (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(щракнете  за да редактирате време/дата)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(щракнете  за да редактирате време/дата/дълбочина)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(няма гмуркания)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(нищо)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 кб.фута/мин"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 кб.фута/мин"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 л/мин"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 гмуркания на стр."
 
@@ -305,68 +285,78 @@ msgstr "2 гмуркания на стр."
 msgid "2 pcs full suit"
 msgstr "2 за цял костюм"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 л/мин"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "3м увеличение за изчислен таван"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 гмуркания на стр."
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
 msgstr ""
-"<small>Добавете сегменти долу.\n"
-"Всеки ред отговаря на част от планираното гмуркане.\n"
-"Входни данни с дълбочина, време и газ, описват сегмент, който свършва в конкретна дълбочина, отнема определено време (пр. '+3:30') и изполва конкретен газ.\n"
-"Празен газ означава 'използвай предния газ' (или въздух).\n"
-"Входни данни с дъбочина и газ, но без време, информира системата за плануване, че газа се използва само за изкачването след като дълбочината е достигната.\n"
-"CC SetPoint означава CC (rebreather) гмуркания. Оставете празно за тип OC.</small>\n"
-
-#: planner.c:1198
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "Въздух"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "За Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Добави гмуркане..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Добави гмуркане"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Добави в горно пътуване"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Добави контролна точка"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Атмосф. налягане"
 
-# SAC = Повърхностно Потребление на Кислород
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Темп. на въздух"
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Tемп. на въздуха в %s"
@@ -375,78 +365,86 @@ msgstr "Tемп. на въздуха в %s"
 msgid "Always prefer downloaded dive"
 msgstr "Винаги предпочитай изтегленото гмуркане"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Апр"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Авг"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Автоматично групиране"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Средно"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Средно"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Средно"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Средно"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Средна дълбочина"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Средна дълбочина (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Средно SAC"
 
-# SAC = Повърхностно Потребление на Кислород
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Средна темп."
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Средно време"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Връщане към OC"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "Бара"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Партньор"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC SetPoint"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Не може да бъде намерен газ %d/%d"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Не може да бъде зареден стилов файл (%s)/%s"
@@ -459,121 +457,143 @@ msgstr "Отмяна. Изпълняване на чист изход..."
 msgid "Cancelled..."
 msgstr "Отмяна..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Не може да бъде напревен разряд!"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Целзии"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Моля изберете XML файл по подразбиране"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Моля изберете XML файлове за вмъкване"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Затвори"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Свиване на всички"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Свръзване..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Грешка при връзка: "
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Създай ново пътуване"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "Кб.Фута"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Бут."
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Бутилка"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Бутилка за плануване"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Бутилки"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "D:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!"
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Дата"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Дата и час"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Дата:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Дек"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "XML файл по подразибране"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Изтрий данни за леководолазен компютър"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Изтрий гмуркане"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Изтрий гмуркания"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Дълбочина"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Дълбочина (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Надминат лимит на дълбочина"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Дълбочина:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Име на устройство"
 
@@ -581,13 +601,18 @@ msgstr "Име на устройство"
 msgid "Device or mount point"
 msgstr "Устройсто или входна точка"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Гмуркане №%1$d - %2$s %4$02d/%3$02d/%5$04d в %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Гмуркане #%1$d - %2$s %3$02d/%4$02d/%5$04d в %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Гмуркане №%d - "
@@ -597,23 +622,27 @@ msgstr "Гмуркане №%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Гмуркане №%d: %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Прякор на леководолазен компютър"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Информация"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Бележки"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "ГМУРКАЧЕСКИ ПЛАНОВИК - ТОВА Е САМО СИМУЛАЦИЯ. НЕ ИЗПОЛЗВАЙТЕ ЗА ИЗТИНСКИ ГМУРКАНИЯ"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Време"
 
@@ -633,15 +662,15 @@ msgstr "Марка и модел на гмуркачески комютър"
 msgid "Dive data import error"
 msgstr "Грешка при вход на данни"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Места за гмуркане"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Водач"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Гмуркането започва кога?"
 
@@ -649,19 +678,19 @@ msgstr "Гмуркането започва кога?"
 msgid "Dive#"
 msgstr "Гмуркане №"
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Шрифт за списъка на гмуркания"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Водач"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Гмуркания"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Местонахождения"
 
@@ -669,111 +698,123 @@ msgstr "Местонахождения"
 msgid "Download From Dive Computer"
 msgstr "Изтегли от леководолазен компютър"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Изтегли от леководолазен компютър..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Изтегли от уеб услугата"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Изтегли от уеб услуга..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Успешно изтегляне!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Продълж. (мин.)"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Продълж. (мин.)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
-msgstr "E"
+msgstr "И"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Редактирай"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Редактирай имена на устройства"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Редактирай прякори на гмуркачерски комютри"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Редактиране на информация за пътуване"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Редактиране на обобщение за пътуване"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Редактирайте като щракнете два пъти в полето за прякор"
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Редактиране на гмуркане"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Редактирай дата/време на гмуркане"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Редактирай гмуркания"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Редактиране на гмуркания"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Редактиране на обобщение за пътуване"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Включване / изключване на събития"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Край"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Мин. дълбочина"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Въведете потребителски ключ и натиснете 'Изтегли'. След като е готово може да натиснете 'Прилагане' ако желаете на приложите промените."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Екипировка"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Грешка при прием на водна соленост"
@@ -823,52 +864,64 @@ msgstr "Събитие: systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Събитие: изчаквание на действие от потребителя"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Разшири всички"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Фаренхайт"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Не могат да бъдат отворени %i файла"
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Не може да бъде напревен разбор на '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Не може да бъде напревен разбор на '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Не може да бъде прочетен '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Не може да бъде прочетен '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Фев"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Фута"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Файл"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Филтър"
 
@@ -876,27 +929,27 @@ msgstr "Филтър"
 msgid "Force download of all dives"
 msgstr "Изтегли всички гмуркания"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Пет"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh за план"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow за план"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (WGS84 или GPS формат)"
 
@@ -905,42 +958,42 @@ msgstr "GPS (WGS84 или GPS формат)"
 msgid "Gas Used"
 msgstr "Използван Газ"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Използван газ"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Използван Газ"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Консумация на газ:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Газ микс"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Общи настройки"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Помощ"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "Режим на готовност"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Вмъкване на XML файл(ове)..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Информация"
 
@@ -948,71 +1001,75 @@ msgstr "Информация"
 msgid "Init Communication"
 msgstr "Започни връзка"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Въведи план"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Грешна дълбочина - не може да бъде направен разряд \"%s\""
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Грешна дълбочина - стойности по-големи от 400м не се поддържат"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Неправилен газ на ред %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Грешно стартово време"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Грешен потребителски ключ"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Ян"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Юли"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Юни"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Линус Торвалдс, Дирк Хондел и други, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Списък"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Литра"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Местонахождение"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Регистър"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Най-дълго"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Най-дълго гмуркане"
 
@@ -1024,35 +1081,52 @@ msgstr "Тревога: слаба батерия"
 msgid "Low Battery Warning"
 msgstr "Внимание: слаба батерия"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Доставчик на карти"
+
+#: main.c:77
 msgid "Mar"
 msgstr "Март"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Маркирай местонахождение"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Маркер"
 
 #: print.c:502
 msgid "Master"
-msgstr "Главен"
+msgstr "Водач"
 
 #: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Внимание: Максимално време на сигнал за декомпресия"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Макс. дълбочина"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Макс. дълбочина (%s):"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Макс. SAC"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Макс. темп."
 
@@ -1062,115 +1136,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Максимална дълбочина: %.*f %s\n"
-"Продължителност: %d мин\n"
-"%s"
+msgstr "Максимална дълбочина: %.*f %s\nПродължителност: %d мин\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Макс. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Макс. налягане"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Май"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Слей гмуркания"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Слей пътуване с горно пътуване"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Слей пътуване с долно пътуване"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Метра"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Мин. дълбочина"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Мин. SAC"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Мин. темп."
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Общи настройки"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Модел"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Пон"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Мултиплатформен, гмуркачески регистър-софтуер написан на C"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
-msgstr "N"
+msgstr "С"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Нов"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Нов стартов номер"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Следващ ГК"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Прякор"
 
@@ -1178,11 +1249,24 @@ msgstr "Прякор"
 msgid "No Tank Data"
 msgstr "Няма информация за резервоар"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Бележки"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
 msgstr "Нов"
 
@@ -1190,12 +1274,12 @@ msgstr "Нов"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Окт"
 
@@ -1203,18 +1287,31 @@ msgstr "Окт"
 msgid "Odd pthread error return"
 msgstr "Грешка върната от phread"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Пътвърди изтриване на избраното?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Отвори файл"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Отвори..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1236,63 +1333,86 @@ msgstr "Внимание: покачване на парциално О2 нал�
 msgid "PO2 Green Warning"
 msgstr "Внимание: парциално О2 налягане в зелената зона"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "PSI"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Изберете на картата"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Плановик"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Настройки"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Настройки..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Налягане"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Налягане:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Предишен ГК"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Напечатай само избраните гмуркания"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Напечатай селекцията"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Тип на печата"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Напечатай..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Профил"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Настройки на профила"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Изход"
 
@@ -1304,7 +1424,7 @@ msgstr "Тревога: оставащо газ-време"
 msgid "RGT Warning"
 msgstr "Внимание: оставащо газ-време"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Оценка"
 
@@ -1313,23 +1433,31 @@ msgstr "Оценка"
 msgid "Reading %s %s"
 msgstr "Четене на гмуркане %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Изтрий пътуване"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Изтрий гмуркане от пътуване"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Изтрий избраните гмуркания от пътуване"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Преномерирай"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Преномерирай..."
 
@@ -1337,20 +1465,21 @@ msgstr "Преномерирай..."
 msgid "Retry"
 msgstr "Опитай пак"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
-msgstr "S"
+msgstr "Ю"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC по време на деко. стоп"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "Добави гмуркане"
 
@@ -1358,43 +1487,47 @@ msgstr "Добави гмуркане"
 msgid "Safety Stop Violation"
 msgstr "Нарушение на безопасно спиране"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Съб"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Запиши като..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Запиши промените?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Запиши файл като?"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Запиши като..."
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Запиши..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Средно време"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Избери събития"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Избери събития..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
 msgid "Sep"
 msgstr "Сеп"
 
@@ -1402,65 +1535,68 @@ msgstr "Сеп"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Кратък запис в req.txt файл\n"
-"Uemis Zurich включен ли е правилно?"
+msgstr "Кратък запис в req.txt файл\nUemis Zurich включен ли е правилно?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Най-късо"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Най-кратко гмуркане"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Покажи Колони"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Покажи EAD, END, EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Покажи MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Покажи калкулиран таван"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Покажи докладван таван в червено"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Покажи на картата"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Покажи pHе диаграма"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Покажи pN%s диаграма"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Покажи pO%s диаграма"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Симулирано гмуркане"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Големина"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Тревога: скорост"
@@ -1469,7 +1605,7 @@ msgstr "Тревога: скорост"
 msgid "Speed Warning"
 msgstr "Внимание: скорост"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Старт"
 
@@ -1477,59 +1613,63 @@ msgstr "Старт"
 msgid "Start download"
 msgstr "Започни теглене"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Статистика"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Статистика %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Статистики"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Статус"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Неразпозната стойност за проценти %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Водолазен костюм"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "Нед"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Време на повърхността"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Налягане на повърхността (м.бара)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Превключи газ на %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Печат на таблица"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Предложение за смяна на резервоар"
@@ -1538,60 +1678,58 @@ msgstr "Предложение за смяна на резервоар"
 msgid "Tank Pressure Info"
 msgstr "Информация: налагане на резервоар"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "TEC настройки"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Температура"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Температура:"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Комбиниран"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Чет"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Време"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"За да редактирате гмуркане\n"
-"щракнете два пъти върху него в гмуркаческия списък"
+msgstr "За да редактирате гмуркане\nщракнете два пъти върху него в гмуркаческия списък"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Превключване на зуум"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Твърде много газови смеси"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Твърде много контролни точки"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Общо време"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Общо време"
 
@@ -1600,24 +1738,24 @@ msgstr "Общо време"
 msgid "Total Weight:"
 msgstr "Тегло:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Пътуване: %1$s, %3$d %2$s, %4$d (%5$d Гмуркане)"
 msgstr[1] "Пътуване: %1$s, %3$d %2$s, %4$d (%5$d Гмуркания)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Вт"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Тип"
 
@@ -1626,20 +1764,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: файловата система е почти пълна\n"
-"Излючете и свържете на ново леководолазния компютър\n"
-"и опитайте пак"
+msgstr "Uemis Zurich: файловата система е почти пълна\nИзлючете и свържете на ново леководолазния компютър\nи опитайте пак"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: Файловата система е пълна\n"
-"Излючете/Свържете на ново леководолазния компютър\n"
-"и опитайте пак"
+msgstr "Uemis Zurich: Файловата система е пълна\nИзлючете/Свържете на ново леководолазния компютър\nи опитайте пак"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1659,115 +1791,119 @@ msgstr "Не може да бъде създаден разряд за %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Не може да бъдe отворен %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Единици"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Маркирайте местонахождение с десния бутон на мишката"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Потребителски ключ"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Ръководство за потребителя"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Изглед"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Видимост"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Обем:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
-msgstr "W"
+msgstr "З"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Внимание - прекалено дълги гмуркания могат да отнемат много време за калкулиране"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Внимание - плануването на прекалено дълбоки гмуркания може да отнеме много време"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Темп. на водата"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Уеб услуга"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Ср"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Тежест"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Система за тежест"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Тегло:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML файл"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Година"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Годишни статистики"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Вече имате въведен ГК от този модел\n"
-"наименуван %s\n"
-"Subsurface може да поддържа прякор за това устройсто за да го различавате от вече съществуващо такова. По подразбиране това е модела и идентификатора показани долу.\n"
-"Ако не желаете да да ползате прякор натиснете 'Отказване'."
+msgstr "Вече имате въведен ГК от този модел\nнаименуван %s\nSubsurface може да поддържа прякор за това устройсто за да го различавате от вече съществуващо такова. По подразбиране това е модела и идентификатора показани долу.\nАко не желаете да да ползате прякор натиснете 'Отказване'."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Имате незаписани промени.\n"
-"Желаете ли да ги запишете преди затваряне на файла?"
+msgstr "Имате незаписани промени.\nЖелаете ли да ги запишете преди затваряне на файла?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Имате незаписани промени във файла %s.\n"
-"Желаете ли да ги запишете преди затваряне на файла?"
+msgstr "Имате незаписани промени във файла %s.\nЖелаете ли да ги запишете преди затваряне на файла?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "въздух"
@@ -1776,7 +1912,11 @@ msgstr "въздух"
 msgid "airtime"
 msgstr "време за въздух"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "глезен"
 
@@ -1784,22 +1924,34 @@ msgstr "глезен"
 msgid "ascent"
 msgstr "покачване"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "нагръбна"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "бара"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "колан"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "бележка"
 
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "таван"
@@ -1808,11 +1960,11 @@ msgstr "таван"
 msgid "ceiling (safety stop)"
 msgstr "таван (безопасен стоп)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "щипка"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "кб.фута"
 
@@ -1824,6 +1976,10 @@ msgstr "данни"
 msgid "deco stop"
 msgstr "деко. стоп"
 
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "дълбочина на спиране"
@@ -1840,40 +1996,48 @@ msgstr "идент. за вписване на местонахождение"
 msgid "divetime"
 msgstr "време за гмуркане"
 
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "сух костюм"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "за вички гмуркания"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "за гмуркане №%d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "за гмуркания №"
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "за избраните гмуркане"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "за избраните гмуркания"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "фута"
 
@@ -1889,10 +2053,18 @@ msgstr "смяна на газ"
 msgid "heading"
 msgstr "посока"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "вградена"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "грешен номер на събитие"
@@ -1901,15 +2073,19 @@ msgstr "грешен номер на събитие"
 msgid "jacket"
 msgstr "яке"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "кг"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "л"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "паунда"
 
@@ -1917,15 +2093,15 @@ msgstr "паунда"
 msgid "long john"
 msgstr "лонг джон"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "м"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "макс ppO2"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "макс CNS"
 
@@ -1937,7 +2113,7 @@ msgstr "макс. дълбочина"
 msgid "membrane"
 msgstr "мембрана"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "мин"
 
@@ -1950,11 +2126,15 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "повече данни за гмуркане"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "повече от %d дни"
 
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "нон стоп време"
@@ -1963,25 +2143,33 @@ msgstr "нон стоп време"
 msgid "none"
 msgstr "няма"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "pHE праг"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "pN%s праг"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "pO%s праг"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "паскала"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1993,6 +2181,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "безопасен стоп"
@@ -2009,6 +2201,10 @@ msgstr "безопасен стоп (свободен)"
 msgid "semidry"
 msgstr "полусух"
 
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "къс"
@@ -2017,12 +2213,21 @@ msgstr "къс"
 msgid "surface"
 msgstr "повърхност"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "внимание: ниво на тъканта"
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1075
+#: statistics.c:22
+msgid "training"
+msgstr ""
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
 msgstr "Lubomir I. Ivanov"
 
@@ -2030,11 +2235,12 @@ msgstr "Lubomir I. Ivanov"
 msgid "transmitter"
 msgstr "предавател"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "неизв."
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -2046,11 +2252,15 @@ msgstr "неопределен"
 msgid "vest"
 msgstr "жилетка"
 
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "нарушение"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "тегло"
 
@@ -2062,67 +2272,6 @@ msgstr "мокър костюм"
 msgid "workload"
 msgstr "натовареност"
 
-#~ msgid "About"
-#~ msgstr "Информация"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Автоматично групиране на гмуркания в пътувания"
-
-#~ msgid "Delete"
-#~ msgstr "Изтрий"
-
-#, fuzzy
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Дълбочина\n"
-#~ "Средна"
-
-#~ msgid "Dive details"
-#~ msgstr "Информяция за гмуркане"
-
-#, fuzzy
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Продължителност\n"
-#~ "Тотално"
-
-#~ msgid "Pretty print"
-#~ msgstr "Красив печат"
-
-#, fuzzy
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "SAC\n"
-#~ "Средно"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "\n"
-#~ "Минимум"
-
-#, fuzzy
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Температура\n"
-#~ "Средна"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP файл"
-
-#~ msgid "deco"
-#~ msgstr "декомпресия"
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/ca_ES.aliases b/po/ca_ES.aliases
new file mode 100644
index 000000000..16fc6795f
--- /dev/null
+++ b/po/ca_ES.aliases
@@ -0,0 +1 @@
+ca
diff --git a/po/it_IT.po.disabled b/po/ca_ES.po
index 31b4ff01a..0eae07a86 100644
--- a/po/it_IT.po.disabled
+++ b/po/ca_ES.po
@@ -1,143 +1,150 @@
-# Italian translations for Subsurface package
-# Italian messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Filippo Moser <filippom@gmail.com>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-13 23:39-0800\n"
-"PO-Revision-Date: 2012-10-20 16:23+0100\n"
-"Last-Translator: Filippo Moser <filippom@gmail.com>\n"
-"Language-Team: Italian\n"
-"Language: it\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Catalan (Spain) (http://www.transifex.com/projects/p/subsurface/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:177
+#: gtk-gui.c:1190
+msgid ""
+"\n"
+"No Events\n"
+msgstr ""
+
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
-msgstr " > Mese"
+msgstr ""
 
-#: webservice.c:237
+#: webservice.c:289
 msgid " Download"
 msgstr ""
 
-#: download-dialog.c:375
+#: download-dialog.c:374
 msgid " Please select dive computer and device. "
-msgstr " Selezionare il computer e la periferica"
+msgstr ""
 
-#: profile.c:413
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr ""
 
-#: profile.c:414
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr ""
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
-msgstr "#"
+msgstr ""
 
-#: print.c:308
-#, fuzzy, c-format
+#: print.c:267 print.c:326
+#, c-format
 msgid "%.*f %s"
-msgstr "%.*f %s/min"
+msgstr ""
 
-#: print.c:253 print.c:326
-#, fuzzy, c-format
+#: print.c:344
+#, c-format
 msgid "%.*f %s\n"
-msgstr "%.*f %s/min"
+msgstr ""
 
-#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
-msgstr "%.*f %s/min"
+msgstr ""
 
-#: planner.c:605
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr ""
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:82
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
+#: print.c:88
 #, c-format
 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"
+msgstr ""
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:560
+#: print.c:566
 #, 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"
+msgstr ""
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:277
+#: divelist.c:569
 #, 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"
+msgstr ""
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:549
+#: statistics-gtk.c:349
 #, 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"
+msgstr ""
 
-#: print.c:585 statistics.c:556
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
-msgstr "%d min"
+msgstr ""
 
-#: statistics.c:521
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
-msgstr "%dt %dst %dmin"
+msgstr ""
 
-#: statistics.c:523
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
-msgstr "%dst %dmin"
+msgstr ""
 
-#: print.c:304
+#: print.c:322
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: profile.c:2148
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
 msgstr ""
 
-#: profile.c:2116
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
 msgstr ""
 
-#: profile.c:2132
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
 msgstr ""
 
-#: profile.c:2135
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
 msgstr ""
 
-#: profile.c:2172
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
@@ -146,49 +153,49 @@ msgid ""
 "EADD:%d%s"
 msgstr ""
 
-#: profile.c:2141
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
 msgstr ""
 
-#: profile.c:2165
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
 msgstr ""
 
-#: profile.c:2144
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
 msgstr ""
 
-#: profile.c:2106
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
 msgstr ""
 
-#: profile.c:2124
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
 msgstr ""
 
-#: profile.c:2127
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
 msgstr ""
 
-#: planner.c:525
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
@@ -197,61 +204,79 @@ msgid ""
 "\n"
 msgstr ""
 
-#: profile.c:2111
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
 msgstr ""
 
-#: profile.c:2160
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
 msgstr ""
 
-#: profile.c:2156
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
 msgstr ""
 
-#: profile.c:2152
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
 msgstr ""
 
-#: dive.c:874
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
-msgstr "(%s) oder (%s)"
+msgstr ""
+
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr ""
 
-#: statistics.c:683
-#, fuzzy, c-format
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr ""
+
+#: statistics.c:265
+#, c-format
 msgid "(no dives)"
-msgstr "Modifica Immersioni"
+msgstr ""
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr ""
 
-#: planner.c:1315
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr ""
 
-#: planner.c:1314
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr ""
 
-#: planner.c:1320
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr ""
 
-#: print.c:909
+#: print.c:956
 msgid "2 dives per page"
 msgstr ""
 
@@ -259,142 +284,170 @@ msgstr ""
 msgid "2 pcs full suit"
 msgstr ""
 
-#: planner.c:1319
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr ""
 
-#: gtk-gui.c:841
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr ""
 
-#: print.c:905
+#: print.c:952
 msgid "6 dives per page"
 msgstr ""
 
-#: planner.c:1264
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
 msgstr ""
 
-#: planner.c:1190
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr ""
 
-#: gtk-gui.c:1058 gtk-gui.c:1381
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr ""
 
-#: gtk-gui.c:1372
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
-msgstr "Aggiungi Immersione..."
+msgstr ""
 
-#: divelist.c:2397
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
-msgstr "Aggiungi immersione"
+msgstr ""
+
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
 
-#: divelist.c:2499
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
-msgstr "Aggiungi al viaggio sopra"
+msgstr ""
 
-#: planner.c:1339
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr ""
 
-#: statistics.c:848
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr ""
 
-#: statistics.c:847
-#, fuzzy
+#: statistics-gtk.c:607
 msgid "Air Temp"
-msgstr "Temperatura Media"
+msgstr ""
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr ""
 
-#: download-dialog.c:391
+#: download-dialog.c:390
 msgid "Always prefer downloaded dive"
 msgstr ""
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
-msgstr "Apr"
+msgstr ""
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
-msgstr "Ago"
+msgstr ""
 
-#: gtk-gui.c:1394
+#: gtk-gui.c:1655
 msgid "Autogroup"
-msgstr "Raggruppa"
+msgstr ""
+
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
 
-#: statistics.c:183
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
-msgstr "Media"
+msgstr ""
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
-msgstr "Media"
+msgstr ""
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
-msgstr "Media"
+msgstr ""
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
-msgstr "Media"
+msgstr ""
 
-#: statistics.c:802 statistics.c:839
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
-msgstr "Profondità media"
+msgstr ""
 
-# surface air consumption (SAC)
-# consumo d'aria in superficie (CAS)
-#: statistics.c:810
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
-msgstr "CAS Medio"
+msgstr ""
 
-#: statistics.c:785
+#: statistics-gtk.c:545
 msgid "Avg Temp"
-msgstr "Temperatura Media"
+msgstr ""
 
-#: statistics.c:792
+#: statistics-gtk.c:552
 msgid "Avg Time"
-msgstr "Tempo Medio"
+msgstr ""
 
-#: profile.c:410
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr ""
 
-#: gtk-gui.c:642
+#: gtk-gui.c:790
 msgid "Bar"
-msgstr "Bar"
+msgstr ""
 
-#: info.c:800 info.c:1253 print.c:487
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
-msgstr "Compagno"
+msgstr ""
 
-#: planner.c:1219
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr ""
 
-#: planner.c:157
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr ""
 
+#: parse-xml.c:1953
+#, c-format
+msgid "Can't open stylesheet (%s)/%s"
+msgstr ""
+
 #: uemis-downloader.c:932
 msgid "Cancelled, exiting cleanly..."
 msgstr ""
@@ -403,174 +456,202 @@ msgstr ""
 msgid "Cancelled..."
 msgstr ""
 
-#: webservice.c:27
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr ""
 
-#: gtk-gui.c:652
+#: gtk-gui.c:800
 msgid "Celsius"
-msgstr "Celsius"
+msgstr ""
 
-#: gtk-gui.c:564
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
-msgstr "Selezionare il file XML di default"
+msgstr ""
 
-#: gtk-gui.c:1900
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
-msgstr "Selezionare i files XML da importare nel file dei dati"
+msgstr ""
 
-#: gtk-gui.c:1367
+#: gtk-gui.c:1622
 msgid "Close"
-msgstr "Chiudi"
+msgstr ""
 
-#: divelist.c:2517
+#: divelist-gtk.c:1815
 msgid "Collapse all"
-msgstr "Minimizza tutto"
+msgstr ""
 
-#: webservice.c:119
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr ""
 
-#: webservice.c:23
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr ""
 
-#: divelist.c:2489
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
-msgstr "Crea un nuovo viaggio sopra"
+msgstr ""
 
-# Cubic foot
-#: gtk-gui.c:648
+#: gtk-gui.c:796
 msgid "CuFt"
-msgstr "Piedi cubi"
+msgstr ""
 
-#: divelist.c:1431 gtk-gui.c:672
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
-msgstr "Bombola"
+msgstr ""
 
-#: equipment.c:918 equipment.c:1029 print.c:195
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
-msgstr "Bombola"
+msgstr ""
 
-#: planner.c:219
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr ""
 
-#: equipment.c:1539
+#: equipment.c:1603
 msgid "Cylinders"
-msgstr "Bombole"
+msgstr ""
 
-#: profile.c:2102
-#, fuzzy, c-format
+#: profile.c:2145
+#, c-format
 msgid "D:%.1f %s"
-msgstr "%.*f %s/min"
+msgstr ""
 
-#: planner.c:1276
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr ""
 
-#: divelist.c:1424 print.c:486 statistics.c:830
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
-msgstr "Data"
+msgstr ""
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
-msgstr "Data e Tempo"
+msgstr ""
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
-msgstr "Data:"
+msgstr ""
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
-msgstr "Dic"
+msgstr ""
 
-#: gtk-gui.c:709
+#: gtk-gui.c:862
 msgid "Default XML Data File"
-msgstr "File XML di default"
+msgstr ""
 
-#: gtk-gui.c:1314
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr ""
 
-#: divelist.c:2239 divelist.c:2292 divelist.c:2384
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
-msgstr "Cancella immersione"
+msgstr ""
 
-#: divelist.c:2241 divelist.c:2383
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
-msgstr "Cancella immersioni"
+msgstr ""
 
-#: print.c:486 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
-msgstr "Profondità"
-
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Profondità (%s):"
+msgstr ""
 
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
-msgstr "Limite Profondità Superato"
+msgstr ""
 
-#: gtk-gui.c:636
+#: gtk-gui.c:784
 msgid "Depth:"
-msgstr "Profondità:"
+msgstr ""
 
-#: gtk-gui.c:1273
-#, fuzzy
+#: gtk-gui.c:1528
 msgid "Device Id"
-msgstr "Nome periferica"
+msgstr ""
 
 #: download-dialog.c:330
 msgid "Device or mount point"
 msgstr ""
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Immersione #%1$d - %2$s %4$02d.%3$02d.%5$04d a %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr ""
 
-#: info.c:157 print.c:77
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
-msgstr "Immersione #%d - "
+msgstr ""
 
 #: libdivecomputer.c:436
 #, c-format
 msgid "Dive %d: %s %d %04d"
-msgstr "Immersione #%d: %s %d %04d"
+msgstr ""
 
-#: gtk-gui.c:1981
-#, fuzzy
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
-msgstr "Computer"
+msgstr ""
 
-#: gtk-gui.c:1611 info.c:998 statistics.c:821
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
-msgstr "Informazioni sull'immersione"
+msgstr ""
 
-#: gtk-gui.c:1603
+#: gtk-gui.c:1872
 msgid "Dive Notes"
-msgstr "Note dell'immersione"
+msgstr ""
 
-#: planner.c:1286
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr ""
 
-#: statistics.c:831
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
-msgstr "Tempo d'Immersione"
+msgstr ""
 
 #: uemis.c:228
 msgid "Dive Time Alert"
-msgstr "Allarme: Tempo d'Immersione"
+msgstr ""
 
 #: uemis.c:226
 msgid "Dive Time Info"
-msgstr "Info: Tempo d'Immersione"
+msgstr ""
 
 #: download-dialog.c:288
 msgid "Dive computer vendor and product"
@@ -580,157 +661,158 @@ msgstr ""
 msgid "Dive data import error"
 msgstr ""
 
-#: print.c:895
-msgid "Dive details"
-msgstr "Dettagli immersione"
-
-#: gps.c:219
-#, fuzzy
+#: gps.c:214
 msgid "Dive locations"
-msgstr "Note dell'immersione"
+msgstr ""
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
-msgstr "Dive master"
+msgstr ""
 
-#: planner.c:1308
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr ""
 
-#: print.c:486
+#: print.c:502
 msgid "Dive#"
-msgstr "Immersione n."
+msgstr ""
 
-#: gtk-gui.c:697
+#: gtk-gui.c:845
 msgid "Divelist Font"
-msgstr "Carattere Immersione"
+msgstr ""
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
-msgstr "Divemaster"
+msgstr ""
 
-#: statistics.c:782
+#: statistics-gtk.c:542
 msgid "Dives"
-msgstr "Immersioni"
+msgstr ""
 
-#: gtk-gui.c:1377
-#, fuzzy
+#: gtk-gui.c:1636
 msgid "Dives Locations"
-msgstr "Luogo"
+msgstr ""
 
-#: download-dialog.c:366
+#: download-dialog.c:365
 msgid "Download From Dive Computer"
-msgstr "Scarica dal Computer"
+msgstr ""
 
-#: gtk-gui.c:1370
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
-msgstr "Scarica dal Computer..."
+msgstr ""
 
-#: webservice.c:210
-#, fuzzy
+#: webservice.c:260
 msgid "Download From Web Service"
-msgstr "Scarica dal Computer"
+msgstr ""
 
-#: gtk-gui.c:1371
-#, fuzzy
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
-msgstr "Scarica dal Computer..."
+msgstr ""
 
-#: webservice.c:29
+#: webservice.c:31
 msgid "Download Success!"
 msgstr ""
 
-#: print.c:486 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
-msgstr "Durata"
+msgstr ""
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
-msgstr "Durata (min)"
+msgstr ""
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr ""
 
-#: planner.c:126
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr ""
 
-#: planner.c:1191
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr ""
 
-#: planner.c:1192
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr ""
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
-msgstr "Modifica"
+msgstr ""
 
-#: gtk-gui.c:1386
-#, fuzzy
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
-msgstr "Nome periferica"
+msgstr ""
 
-#: gtk-gui.c:1246
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr ""
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
-msgstr "Modifica Informazioni Viaggio"
+msgstr ""
 
-#: divelist.c:2405
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
-msgstr "Modifica Riepilogo Viaggio"
+msgstr ""
 
-#: gtk-gui.c:1306
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr ""
 
-#: divelist.c:2381
+#: divelist-gtk.c:1650
 msgid "Edit dive"
-msgstr "Modifica Immersione"
+msgstr ""
 
-#: divelist.c:2438 divelist.c:2461
-#, fuzzy
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
-msgstr "Modifica Immersione"
+msgstr ""
 
-#: divelist.c:2380
+#: divelist-gtk.c:1649
 msgid "Edit dives"
-msgstr "Modifica Immersioni"
+msgstr ""
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
-msgstr "Modifica più immerisoni"
+msgstr ""
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
-msgstr "Modifica il riepilogo di viaggio"
+msgstr ""
 
-#: gtk-gui.c:961
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
-msgstr "Abilita / Disabilita Eventi"
+msgstr ""
+
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
 
-#: equipment.c:949 equipment.c:1456
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
-msgstr "Fine"
+msgstr ""
 
-#: planner.c:1216
-#, fuzzy
+#: planner-gtk.c:288
 msgid "Ending Depth"
-msgstr "Profondità Minima"
+msgstr ""
 
-#: webservice.c:223
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr ""
 
-#: gtk-gui.c:1607 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
-msgstr "Attrezzatura"
+msgstr ""
+
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
 
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
@@ -781,404 +863,455 @@ msgstr ""
 msgid "Event: waiting for user action"
 msgstr ""
 
-#: divelist.c:2513
+#: divelist-gtk.c:1811
 msgid "Expand all"
-msgstr "Espandi tutto"
+msgstr ""
 
-#: gtk-gui.c:653
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
-msgstr "Fahrenheit"
+msgstr ""
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
-msgstr "Impossibile aprire i file %i"
+msgstr ""
 
-#: parse-xml.c:1448
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
-msgstr "Impossibile analizzare  '%s'"
+msgstr ""
 
-#: parse-xml.c:1443
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
-msgstr "Impossibile analizzare '%s'.\n"
+msgstr ""
 
-#: file.c:267
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
-msgstr "Impossibile leggere '%s'"
+msgstr ""
 
-#: file.c:263
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
-msgstr "Impossibile leggere '%s'.\n"
+msgstr ""
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
-msgstr "Feb"
+msgstr ""
 
-#: gtk-gui.c:638
+#: gtk-gui.c:786
 msgid "Feet"
-msgstr "Piedi"
+msgstr ""
 
-#: gtk-gui.c:1357
+#: gtk-gui.c:1612
 msgid "File"
-msgstr "File"
+msgstr ""
 
-#: gtk-gui.c:1360
+#: gtk-gui.c:1615
 msgid "Filter"
-msgstr "Filtro"
+msgstr ""
 
-#: download-dialog.c:385
+#: download-dialog.c:384
 msgid "Force download of all dives"
 msgstr ""
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
-msgstr "Ven"
+msgstr ""
 
-#: gtk-gui.c:859
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr ""
 
-#: planner.c:1331
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr ""
 
-#: gtk-gui.c:849
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr ""
 
-#: planner.c:1330
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr ""
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr ""
 
 #. ++GETTEXT Gas Used is amount used
-#: print.c:197
+#: print.c:203
 msgid "Gas Used"
-msgstr "Gas Usato"
+msgstr ""
 
-#: statistics.c:857
-#, fuzzy
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
-msgstr "Gas Usato"
+msgstr ""
 
-#: planner.c:1218
-#, fuzzy
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
-msgstr "Gas Usato"
+msgstr ""
 
-#: planner.c:594
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr ""
 
-#: equipment.c:959 print.c:195
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
-msgstr "Miscela di gas"
+msgstr ""
 
-#: gtk-gui.c:629
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr ""
 
-#: gtk-gui.c:1362
+#: gtk-gui.c:1617
 msgid "Help"
-msgstr "Aiuto"
+msgstr ""
 
-#: webservice.c:244
+#: webservice.c:296
 msgid "Idle"
 msgstr ""
 
-#: gtk-gui.c:1369
-msgid "Import XML File(s)..."
-msgstr "Importa file(s) XML..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
 
-#: gtk-gui.c:1384
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
-msgstr "Informazioni"
+msgstr ""
 
 #: uemis-downloader.c:769
 msgid "Init Communication"
 msgstr ""
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr ""
 
-#: planner.c:1079
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr ""
 
-#: planner.c:1081
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr ""
 
-#: planner.c:1057
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr ""
 
-#: planner.c:1145
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr ""
 
-#: webservice.c:25
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr ""
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
-msgstr "Gen"
+msgstr ""
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
-msgstr "Lug"
+msgstr ""
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
-msgstr "Giu"
+msgstr ""
+
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
 
-#: gtk-gui.c:1064
-#, fuzzy
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
-msgstr "Linus Torvalds, Dirk Hohndel e altri, 2011, 2012"
+msgstr ""
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1643
 msgid "List"
-msgstr "Lista"
+msgstr ""
 
-#: gtk-gui.c:647
+#: gtk-gui.c:795
 msgid "Liter"
-msgstr "Litri"
+msgstr ""
 
-#: divelist.c:1436 info.c:621 info.c:772 info.c:1247 print.c:487
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
-msgstr "Luogo"
+msgstr ""
 
-#: gtk-gui.c:1358
+#: gtk-gui.c:1613
 msgid "Log"
-msgstr "Log"
+msgstr ""
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
-msgstr "Più lunga"
+msgstr ""
 
-#: statistics.c:793
+#: statistics-gtk.c:553
 msgid "Longest Dive"
-msgstr "Immersione più lunga"
+msgstr ""
 
 #: uemis.c:236
 msgid "Low Battery Alert"
-msgstr "Allarme: Batteria scarica"
+msgstr ""
 
 #: uemis.c:234
 msgid "Low Battery Warning"
-msgstr "Avviso: Batteria Scarica"
+msgstr ""
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr ""
+
+#: main.c:77
 msgid "Mar"
-msgstr "Mar"
+msgstr ""
+
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
 
-#: gps.c:59
+#: gps.c:53
 msgid "Mark location here"
 msgstr ""
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
 #: uemis.c:230
 msgid "Marker"
-msgstr "Marcatore"
+msgstr ""
 
-#: print.c:486
+#: print.c:502
 msgid "Master"
-msgstr "Master"
+msgstr ""
 
 #: uemis.c:224
 msgid "Max Deco Time Warning"
-msgstr "Avviso: Massimo tempo di decompressione"
+msgstr ""
 
-#: statistics.c:800 statistics.c:838
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
-msgstr "Profondità Massima"
+msgstr ""
 
-#: statistics.c:808
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
-msgstr "CAS Massimo"
+msgstr ""
 
-#: statistics.c:783
+#: statistics-gtk.c:543
 msgid "Max Temp"
-msgstr "Temperatura Massima"
+msgstr ""
 
-#: print.c:103
+#: print.c:109
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
 msgstr ""
-"Profontià massima: %.*f %s\n"
-"Durata: %d min\n"
-"%s"
 
-#: print.c:359
+#: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr ""
 
-#: equipment.c:1454
+#: equipment.c:1518
 msgid "MaxPress"
-msgstr "Pressione Massima"
+msgstr ""
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
-msgstr "Massimo"
+msgstr ""
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
-msgstr "Massimo"
+msgstr ""
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
-msgstr "Massimo"
+msgstr ""
 
-#: main.c:71
+#: main.c:77
 msgid "May"
-msgstr "Mag"
+msgstr ""
 
-#: divelist.c:2372
-#, fuzzy
+#: divelist-gtk.c:1641
 msgid "Merge dives"
-msgstr "Cancella immersioni"
+msgstr ""
 
-#: divelist.c:2413
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
-msgstr "Raggruppa il viaggio con il viaggio sopra"
+msgstr ""
 
-#: divelist.c:2423
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
-msgstr "Raggruppa il viaggio con il viaggio sotto"
+msgstr ""
 
-#: gtk-gui.c:637
+#: gtk-gui.c:785
 msgid "Meter"
-msgstr "Metro"
+msgstr ""
 
-#: statistics.c:801
+#: statistics-gtk.c:561
 msgid "Min Depth"
-msgstr "Profondità Minima"
+msgstr ""
 
-#: statistics.c:809
+#: statistics-gtk.c:569
 msgid "Min SAC"
-msgstr "Min. CAS"
+msgstr ""
 
-#: statistics.c:784
+#: statistics-gtk.c:544
 msgid "Min Temp"
-msgstr "Temperatura Minima"
+msgstr ""
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
-msgstr "Minimo"
+msgstr ""
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
-msgstr "Minimo"
+msgstr ""
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
-msgstr "Minimo"
+msgstr ""
 
-#: gtk-gui.c:703
+#: gtk-gui.c:851
 msgid "Misc. Options"
-msgstr "Opzioni"
+msgstr ""
 
-#: gtk-gui.c:1268
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr ""
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
-msgstr "Lun"
+msgstr ""
 
-#: gtk-gui.c:1060
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
-msgstr "Programma Multi-piattaforma in C per il log delle immersioni"
+msgstr ""
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr ""
 
-#: gtk-gui.c:1363
+#: gtk-gui.c:1618
 msgid "New"
-msgstr "Nuovo"
+msgstr ""
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1238
 msgid "New starting number"
-msgstr "Nuovo numero di inizio"
+msgstr ""
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr ""
 
-#: gtk-gui.c:1278 gtk-gui.c:2003
-#, fuzzy
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
-msgstr "Nome periferica"
+msgstr ""
 
 #: uemis.c:232
 msgid "No Tank Data"
-msgstr "Nessun dato sulla bombola"
+msgstr ""
+
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
 
-#: info.c:626 info.c:825 info.c:1261
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
-msgstr "Note"
+msgstr ""
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
-msgstr "Nov"
+msgstr ""
 
 #: libdivecomputer.c:153
 msgid "OLF"
 msgstr ""
 
-#: divelist.c:1434 gtk-gui.c:730 print.c:343 statistics.c:855
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
-msgstr "OTU"
+msgstr ""
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
-msgstr "Ott"
+msgstr ""
 
 #: libdivecomputer.c:770
 msgid "Odd pthread error return"
 msgstr ""
 
-#: gtk-gui.c:1325
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr ""
 
-#: gtk-gui.c:276
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
 msgid "Open File"
-msgstr "Apri File"
+msgstr ""
 
-#: gtk-gui.c:1364
+#: gtk-gui.c:1619
 msgid "Open..."
-msgstr "Apri..."
+msgstr ""
+
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
 
-#: print.c:167
+#: print.c:173
 #, c-format
 msgid "Oxygen"
 msgstr ""
@@ -1189,418 +1322,448 @@ msgstr ""
 
 #: uemis.c:210
 msgid "PO2 Ascend Alarm"
-msgstr "Allarme Incremento PO2"
+msgstr ""
 
 #: uemis.c:208
 msgid "PO2 Ascend Warning"
-msgstr "Avviso Incremento PO2"
+msgstr ""
 
 #: uemis.c:205
 msgid "PO2 Green Warning"
-msgstr "Avviso PO2 Verde"
+msgstr ""
 
-#: gtk-gui.c:643
+#: gtk-gui.c:791
 msgid "PSI"
-msgstr "PSI"
+msgstr ""
+
+#: webservice.c:341
+msgid "Password"
+msgstr ""
 
-#: info.c:788
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr ""
 
-#: gtk-gui.c:1361
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr ""
 
-#: gtk-gui.c:614
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
 msgid "Preferences"
-msgstr "Preferenze"
+msgstr ""
 
-#: gtk-gui.c:1373
+#: gtk-gui.c:1632
 msgid "Preferences..."
-msgstr "Preferenze..."
+msgstr ""
 
-#: equipment.c:938 equipment.c:944
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
-msgstr "Pressione"
+msgstr ""
 
-#: gtk-gui.c:641
+#: gtk-gui.c:789
 msgid "Pressure:"
-msgstr "Pressione:"
+msgstr ""
 
-#: gtk-gui.c:1387
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr ""
 
-#: print.c:932
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
 msgid "Print only selected dives"
-msgstr "Stampa solo le immersioni selezionate"
+msgstr ""
 
-#: print.c:927
+#: print.c:974
 msgid "Print selection"
-msgstr "Stampa selezione"
+msgstr ""
 
-#: print.c:899
+#: print.c:939 print.c:946
 msgid "Print type"
-msgstr "Stampa tipo"
+msgstr ""
 
-#: gtk-gui.c:1368
+#: gtk-gui.c:1623
 msgid "Print..."
-msgstr "Stampa..."
+msgstr ""
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1644
 msgid "Profile"
-msgstr "Profilo"
+msgstr ""
 
-#: gtk-gui.c:740
-#, fuzzy
+#: gtk-gui.c:898
 msgid "Profile Settings"
-msgstr "Profilo"
+msgstr ""
+
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
 
-#: gtk-gui.c:1380
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
-msgstr "Esci"
+msgstr ""
 
-# remaining gas time (RGT)
 #: uemis.c:218
 msgid "RGT Alert"
-msgstr "Allarme RGT"
+msgstr ""
 
 #: uemis.c:216
 msgid "RGT Warning"
-msgstr "Avviso RGT"
+msgstr ""
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
-msgstr "Valutazione"
+msgstr ""
 
 #: uemis-downloader.c:364
-#, fuzzy, c-format
+#, c-format
 msgid "Reading %s %s"
-msgstr "Lettura immersione %s in corso"
+msgstr ""
+
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
 
-#: divelist.c:2084 divelist.c:2428
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
-msgstr "Rimuovi Viaggio"
+msgstr ""
 
-#: divelist.c:2507
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
-msgstr "Rimuovi immersione dal viaggio"
+msgstr ""
+
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
 
-#: divelist.c:2505
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
-msgstr "Rimuovi le immersioni selezionate dal viaggio"
+msgstr ""
 
-#: gtk-gui.c:1003
+#: gtk-gui.c:1229
 msgid "Renumber"
-msgstr "Rinumera"
+msgstr ""
 
-#: gtk-gui.c:1374
+#: gtk-gui.c:1633
 msgid "Renumber..."
-msgstr "Rinumera..."
+msgstr ""
 
 #: download-dialog.c:141
 msgid "Retry"
-msgstr "Riprova"
+msgstr ""
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr ""
 
-# SAC surface air consumption
-#: divelist.c:1433 gtk-gui.c:682 print.c:377 statistics.c:175 statistics.c:854
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
-msgstr "CAS"
+msgstr ""
 
-#: planner.c:1325
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr ""
 
-#: planner.c:1324
-#, fuzzy
+#: planner-gtk.c:398
 msgid "SAC during dive"
-msgstr "Aggiungi immersione"
-
-#: file.c:75
-msgid "ZIP file"
-msgstr "ZIP File"
+msgstr ""
 
 #: uemis.c:198
 msgid "Safety Stop Violation"
-msgstr "Violazione della tappa di sicurezza"
+msgstr ""
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
-msgstr "Sab"
+msgstr ""
 
-#: gtk-gui.c:1366
+#: gtk-gui.c:1621
 msgid "Save As..."
-msgstr "Salva Come..."
+msgstr ""
 
-#: gtk-gui.c:206
+#: gtk-gui.c:227
 msgid "Save Changes?"
-msgstr "Salvare le modifiche?"
+msgstr ""
 
-#: divelist.c:1637 gtk-gui.c:143
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
-msgstr "Salvare il File come"
+msgstr ""
 
-#: divelist.c:2445
-#, fuzzy
+#: divelist-gtk.c:1720
 msgid "Save as"
-msgstr "Salva Come..."
+msgstr ""
 
-#: gtk-gui.c:1365
+#: gtk-gui.c:1620
 msgid "Save..."
-msgstr "Salva..."
+msgstr ""
 
-#: planner.c:1217
-#, fuzzy
+#: planner-gtk.c:289
 msgid "Segment Time"
-msgstr "Tempo Medio"
+msgstr ""
 
-#: gtk-gui.c:952
-#, fuzzy
+#: gtk-gui.c:1174
 msgid "Select Events"
-msgstr "Seleziona Eventi"
+msgstr ""
 
-#: gtk-gui.c:1379
-#, fuzzy
+#: gtk-gui.c:1638
 msgid "Select Events..."
-msgstr "Seleziona Eventi..."
+msgstr ""
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
 msgid "Sep"
-msgstr "Set"
+msgstr ""
 
 #: uemis-downloader.c:30
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
 msgstr ""
-"Scrittura breve sul file req.txt\n"
-"Lo Uemis Zurich e' collegato correttamente?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
-msgstr "Più corto"
+msgstr ""
 
-#: statistics.c:794
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
-msgstr "Immersione più corta"
+msgstr ""
 
-#: gtk-gui.c:661 gtk-gui.c:724
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
-msgstr "Visualizza Colonne"
+msgstr ""
 
-#: gtk-gui.c:820
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr ""
 
-#: gtk-gui.c:803
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr ""
 
-#: gtk-gui.c:836
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr ""
 
-#: gtk-gui.c:828
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr ""
 
-#: divelist.c:2478
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr ""
 
-#: gtk-gui.c:786
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr ""
 
-#: gtk-gui.c:767
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr ""
 
-#: gtk-gui.c:748
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr ""
 
-#: planner.c:243
-#, fuzzy
+#: planner.c:209
 msgid "Simulated Dive"
-msgstr "Cancella Immersione"
+msgstr ""
 
-#: equipment.c:935 equipment.c:1453
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
-msgstr "Dimensione"
+msgstr ""
+
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
 
 #: uemis.c:200
 msgid "Speed Alarm"
-msgstr "Allarme Risalita Veloce"
+msgstr ""
 
 #: uemis.c:203
 msgid "Speed Warning"
-msgstr "Avviso Risalita Veloce"
+msgstr ""
 
-#: equipment.c:946 equipment.c:1455
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
-msgstr "Inizio"
+msgstr ""
 
 #: uemis-downloader.c:782
 msgid "Start download"
 msgstr ""
 
-#: statistics.c:772
+#: statistics-gtk.c:532
 msgid "Statistics"
-msgstr "Statistiche"
+msgstr ""
 
-#: statistics.c:708
-#, fuzzy, c-format
+#: statistics-gtk.c:468
+#, c-format
 msgid "Statistics %s"
-msgstr "Statistiche"
+msgstr ""
 
-#: gtk-gui.c:1615
+#: gtk-gui.c:1884
 msgid "Stats"
-msgstr "Statistiche"
+msgstr ""
 
-#: webservice.c:243
-#, fuzzy
+#: webservice.c:295
 msgid "Status"
-msgstr "Statistiche"
+msgstr ""
 
-#: planner.c:575
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr ""
 
-#: divelist.c:1430 gtk-gui.c:692 info.c:806 info.c:1259
+#: parse-xml.c:443
+#, c-format
+msgid "Strange percentage reading %s\n"
+msgstr ""
+
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
-msgstr "Muta"
+msgstr ""
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
-msgstr "Dom"
+msgstr ""
 
-#: statistics.c:832
+#: statistics-gtk.c:592
 msgid "Surf Intv"
-msgstr "Intervallo di Superficie"
+msgstr ""
 
-#: planner.c:1309
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr ""
 
-#: planner.c:586
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr ""
 
-#: print.c:913
+#: print.c:960
 msgid "Table print"
-msgstr "Stampa Tabella"
+msgstr ""
+
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
 
 #: uemis.c:220
 msgid "Tank Change Suggested"
-msgstr "Suggerito Cambio Bombola"
+msgstr ""
 
 #: uemis.c:214
 msgid "Tank Pressure Info"
-msgstr "Informazione Pressione della bombola"
+msgstr ""
 
-#: gtk-gui.c:722
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr ""
 
-#: gtk-gui.c:667
+#: gtk-gui.c:815
 msgid "Temp"
-msgstr "Temperatura"
+msgstr ""
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
-msgstr "Temperatura"
+msgstr ""
 
-#: gtk-gui.c:651
+#: gtk-gui.c:799
 msgid "Temperature:"
-msgstr "Temperatura:"
+msgstr ""
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1646
 msgid "Three"
-msgstr "Albero"
+msgstr ""
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
-msgstr "Gio"
+msgstr ""
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
-msgstr "Tempo"
+msgstr ""
 
-#: gtk-gui.c:1501
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
 msgstr ""
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
-msgstr "Zoom Alternativo"
+msgstr ""
 
-#: planner.c:212
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr ""
 
-#: planner.c:1245
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr ""
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
-msgstr "Totale"
+msgstr ""
 
-#: statistics.c:791
+#: statistics-gtk.c:551
 msgid "Total Time"
-msgstr "Tempo Totale"
+msgstr ""
 
-#: print.c:322
-#, fuzzy, c-format
+#: print.c:340
+#, c-format
 msgid "Total Weight:"
-msgstr "Peso:"
+msgstr ""
 
-#: planner.c:566
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr ""
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:268
+#: divelist.c:583
 #, 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)"
-msgstr[0] "Viaggio %1$s, %3$d. %2$s %4$d (%5$d Immersione)"
-msgstr[1] "Viaggio %1$s, %3$d. %2$s %4$d (%5$d Immersioni)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
-msgstr "Mar"
+msgstr ""
 
-#: equipment.c:1452 equipment.c:1480
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
 
 #: uemis-downloader.c:28
-#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
 msgstr ""
-"Uemis Zurich: Il File System è quasi pieno\n"
-"Disconnettere/Riconnettere il computer\n"
-"e riprovare"
 
 #: uemis-downloader.c:29
 msgid ""
@@ -1608,13 +1771,10 @@ msgid ""
 "Disconnect/reconnect the dive computer\n"
 "and try again"
 msgstr ""
-"Uemis Zurich: File System pieno\n"
-"Disconnettere/connettere il computer\n"
-"e riprovare"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
-msgstr "Impossibile inizializzare l'Uemis"
+msgstr ""
 
 #: libdivecomputer.c:699
 msgid "Unable to create libdivecomputer context"
@@ -1626,84 +1786,100 @@ msgid "Unable to create parser for %s %s"
 msgstr ""
 
 #: libdivecomputer.c:701
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open %s %s (%s)"
-msgstr "Impossibile aprire i file %i"
+msgstr ""
 
-#: gtk-gui.c:630
+#: gtk-gui.c:778
 msgid "Units"
-msgstr "Unità"
+msgstr ""
+
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
 
-#: gps.c:217
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr ""
 
-#: webservice.c:230
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr ""
 
-#: gtk-gui.c:1359
+#: gtk-gui.c:1642
+msgid "User Manual"
+msgstr ""
+
+#: gtk-gui.c:1614
 msgid "View"
-msgstr "Visualizza"
+msgstr ""
 
-#: info.c:811 statistics.c:840
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr ""
 
-#: gtk-gui.c:646
+#: gtk-gui.c:794
 msgid "Volume:"
-msgstr "Volume:"
+msgstr ""
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr ""
 
-#: planner.c:367
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr ""
 
-#: planner.c:1073
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr ""
 
-#: statistics.c:846
+#: statistics-gtk.c:606
 msgid "Water Temp"
-msgstr "Temperatura dell'acqua"
+msgstr ""
 
-#: webservice.c:258
+#: webservice.c:163
 msgid "Webservice"
 msgstr ""
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
-msgstr "Mer"
+msgstr ""
 
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:687
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
-#: equipment.c:1084 print.c:290
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
-msgstr "Sistema di Zavorra"
+msgstr ""
 
-#: gtk-gui.c:656
+#: gtk-gui.c:804
 msgid "Weight:"
-msgstr "Peso:"
+msgstr ""
 
-#: gtk-gui.c:131
+#: gtk-gui.c:152
 msgid "XML file"
-msgstr "File XML"
+msgstr ""
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
-msgstr "Anno"
+msgstr ""
 
-#: gtk-gui.c:1375 statistics.c:383
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
-msgstr "Statistiche Annuali"
+msgstr ""
 
-#: gtk-gui.c:1989
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
@@ -1712,57 +1888,69 @@ msgid ""
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
 msgstr ""
 
-#: gtk-gui.c:216
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
 msgstr ""
-"Non hai salvato le modifiche.\n"
-"Vuoi salvare prima di chiudere il file dei dati?"
 
-#: gtk-gui.c:219 gtk-gui.c:222
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
 msgstr ""
-"Non hai salvato le modifiche al file %s.\n"
-"Vuoi salvare prima di chiudere il file dei dati?"
 
-#: divelist.c:544 planner.c:124 planner.c:790 planner.c:791 print.c:172
-#: profile.c:399
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
-msgstr "aria"
+msgstr ""
 
 #: libdivecomputer.c:153
 msgid "airtime"
 msgstr ""
 
-#: equipment.c:828
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
 msgid "ankle"
-msgstr "caviglia"
+msgstr ""
 
 #: libdivecomputer.c:149
 msgid "ascent"
 msgstr ""
 
-#: equipment.c:829
+#: equipment.c:893
 msgid "backplate weight"
-msgstr "peso della piastra"
+msgstr ""
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
-msgstr "bar"
+msgstr ""
 
-#: equipment.c:827
+#: equipment.c:891
 msgid "belt"
-msgstr "cintura"
+msgstr ""
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr ""
 
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr ""
@@ -1771,13 +1959,13 @@ msgstr ""
 msgid "ceiling (safety stop)"
 msgstr ""
 
-#: equipment.c:830
+#: equipment.c:894
 msgid "clip-on"
-msgstr "clip-on"
+msgstr ""
 
-#: dive.c:91 planner.c:958
+#: dive.c:93 planner.c:951
 msgid "cuft"
-msgstr "piedi cubi"
+msgstr ""
 
 #: uemis-downloader.c:384
 msgid "data"
@@ -1787,6 +1975,10 @@ msgstr ""
 msgid "deco stop"
 msgstr ""
 
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr ""
@@ -1803,43 +1995,50 @@ msgstr ""
 msgid "divetime"
 msgstr ""
 
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr ""
 
-#: planner.c:792
-#, fuzzy
+#: planner.c:780
 msgid "ean"
-msgstr "Gen"
+msgstr ""
 
-#: statistics.c:681
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr ""
 
-#: statistics.c:677
-#, fuzzy, c-format
+#: statistics.c:259
+#, c-format
 msgid "for dive #%d"
-msgstr "Immersione #%d - "
+msgstr ""
 
-#: statistics.c:636
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr ""
 
-#: statistics.c:679
-#, fuzzy, c-format
+#: statistics.c:261
+#, c-format
 msgid "for selected dive"
-msgstr "Stampa solo le immersioni selezionate"
+msgstr ""
 
-#: statistics.c:643
-#, fuzzy, c-format
+#: statistics.c:224
+#, c-format
 msgid "for selected dives"
-msgstr "Stampa solo le immersioni selezionate"
+msgstr ""
+
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
 
-#: dive.c:117 divelist.c:1426 info.c:1178 planner.c:896
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
-msgstr "ft"
+msgstr ""
 
 #: uemis-downloader.c:590
 msgid "full suit"
@@ -1853,9 +2052,17 @@ msgstr ""
 msgid "heading"
 msgstr ""
 
-#: equipment.c:826
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
 msgid "integrated"
-msgstr "integrato"
+msgstr ""
+
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
 
 #: libdivecomputer.c:171
 msgid "invalid event number"
@@ -1865,46 +2072,49 @@ msgstr ""
 msgid "jacket"
 msgstr ""
 
-#: dive.c:141 equipment.c:1004 gtk-gui.c:657
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
-msgstr "kg"
+msgstr ""
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
-msgstr "l"
+msgstr ""
+
+#: statistics.c:21
+msgid "lake"
+msgstr ""
 
-#: dive.c:137 divelist.c:1429 equipment.c:1006 gtk-gui.c:658
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
-msgstr "lbs"
+msgstr ""
 
 #: uemis-downloader.c:590
 msgid "long john"
 msgstr ""
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
-msgstr "m"
+msgstr ""
 
-#: gtk-gui.c:808
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr ""
 
-#: divelist.c:1435 gtk-gui.c:735
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr ""
 
 #: libdivecomputer.c:153
-#, fuzzy
 msgid "maxdepth"
-msgstr "Profondità Massima"
+msgstr ""
 
 #: uemis-downloader.c:591
 msgid "membrane"
 msgstr ""
 
-#: divelist.c:1427 planner.c:964
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
-msgstr "min"
+msgstr ""
 
 #: libdivecomputer.c:630
 #, c-format
@@ -1912,14 +2122,17 @@ msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgstr ""
 
 #: uemis-downloader.c:409
-#, fuzzy
 msgid "more data dive id"
-msgstr "più di %d giorni"
+msgstr ""
 
-#: statistics.c:515
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
-msgstr "più di %d giorni"
+msgstr ""
+
+#: statistics.c:22
+msgid "night"
+msgstr ""
 
 #: libdivecomputer.c:154
 msgid "non stop time"
@@ -1929,27 +2142,35 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: gtk-gui.c:791
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr ""
 
-#: gtk-gui.c:773
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr ""
 
-#: gtk-gui.c:754
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr ""
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
-msgstr "pascal"
+msgstr ""
+
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
 
-#: dive.c:50
+#: dive.c:52
 msgid "psi"
-msgstr "psi"
+msgstr ""
 
 #: libdivecomputer.c:149
 msgid "rbt"
@@ -1959,6 +2180,10 @@ msgstr ""
 msgid "rgbm"
 msgstr ""
 
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr ""
@@ -1975,6 +2200,10 @@ msgstr ""
 msgid "semidry"
 msgstr ""
 
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr ""
@@ -1983,42 +2212,56 @@ msgstr ""
 msgid "surface"
 msgstr ""
 
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr ""
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1066
+#: statistics.c:22
+msgid "training"
+msgstr ""
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
-msgstr "Filippo Moser"
+msgstr ""
 
 #: libdivecomputer.c:150
 msgid "transmitter"
 msgstr ""
 
-#: equipment.c:1345 equipment.c:1365
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
-msgstr "sconosciuto"
+msgstr ""
 
-#: libdivecomputer.c:152 print.c:303 statistics.c:561 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
-msgstr "sconosciuto"
+msgstr ""
 
 #: equipment.c:540
 msgid "unspecified"
-msgstr "non specificato"
+msgstr ""
 
 #: uemis-downloader.c:590
 msgid "vest"
 msgstr ""
 
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "violation"
-msgstr "violazione"
+msgstr ""
 
-#: equipment.c:1481
+#: equipment.c:1545
 msgid "weight"
-msgstr "peso"
+msgstr ""
 
 #: uemis-downloader.c:589
 msgid "wetsuit"
@@ -2028,14 +2271,6 @@ msgstr ""
 msgid "workload"
 msgstr ""
 
-#~ msgid "About"
-#~ msgstr "Informazioni"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Raggruppa automaticamente immersioni in viaggi"
-
-#~ msgid "Delete"
-#~ msgstr "Cancella"
-
-#~ msgid "Pretty print"
-#~ msgstr "Stampa Formattata"
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/da_DK.aliases b/po/da_DK.aliases
new file mode 100644
index 000000000..98331b36e
--- /dev/null
+++ b/po/da_DK.aliases
@@ -0,0 +1 @@
+dk
diff --git a/po/da_DK.po b/po/da_DK.po
new file mode 100644
index 000000000..dffebaf97
--- /dev/null
+++ b/po/da_DK.po
@@ -0,0 +1,2276 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: subsurface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Danish (Denmark) (http://www.transifex.com/projects/p/subsurface/language/da_DK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da_DK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gtk-gui.c:1190
+msgid ""
+"\n"
+"No Events\n"
+msgstr ""
+
+#: statistics-gtk.c:94
+msgctxt "Stats"
+msgid " > Month"
+msgstr ""
+
+#: webservice.c:289
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:374
+msgid " Please select dive computer and device. "
+msgstr ""
+
+#: profile.c:429
+msgctxt "Starts with space!"
+msgid " begin"
+msgstr ""
+
+#: profile.c:430
+msgctxt "Starts with space!"
+msgid " end"
+msgstr ""
+
+#: statistics-gtk.c:92
+msgid "#"
+msgstr ""
+
+#: print.c:267 print.c:326
+#, c-format
+msgid "%.*f %s"
+msgstr ""
+
+#: print.c:344
+#, c-format
+msgid "%.*f %s\n"
+msgstr ""
+
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
+#, c-format
+msgid "%.*f %s/min"
+msgstr ""
+
+#: planner.c:581
+#, c-format
+msgid "%.0f%s of %s\n"
+msgstr ""
+
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
+#: print.c:88
+#, c-format
+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:566
+#, 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:569
+#, 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-gtk.c:349
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr ""
+
+#: print.c:582 statistics-gtk.c:356
+#, c-format
+msgid "%d min"
+msgstr ""
+
+#: statistics.c:204
+#, c-format
+msgid "%dd %dh %dmin"
+msgstr ""
+
+#: statistics.c:206
+#, c-format
+msgid "%dh %dmin"
+msgstr ""
+
+#: print.c:322
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2191
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2159
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2175
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2178
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2215
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2184
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2208
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2187
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2149
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2167
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2170
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: planner.c:501
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2154
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2203
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2199
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2195
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
+#, c-format
+msgid "(%s) or (%s)"
+msgstr ""
+
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr ""
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr ""
+
+#: statistics.c:265
+#, c-format
+msgid "(no dives)"
+msgstr ""
+
+#: gtk-gui.c:2392
+msgid "(nothing)"
+msgstr ""
+
+#: planner-gtk.c:389
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner-gtk.c:388
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: planner-gtk.c:394
+msgid "17 l/min"
+msgstr ""
+
+#: print.c:956
+msgid "2 dives per page"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner-gtk.c:393
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:999
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:952
+msgid "6 dives per page"
+msgstr ""
+
+#: planner-gtk.c:336
+msgid ""
+"<small>Add segments below.\n"
+"Each line describes part of the planned dive.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
+"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
+msgstr ""
+
+#: planner-gtk.c:262
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1284 gtk-gui.c:1641
+msgid "About Subsurface"
+msgstr ""
+
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
+msgid "Add Dive..."
+msgstr ""
+
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
+msgid "Add dive"
+msgstr ""
+
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
+msgid "Add to trip above"
+msgstr ""
+
+#: planner-gtk.c:413
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics-gtk.c:608
+msgid "Air Press"
+msgstr ""
+
+#: statistics-gtk.c:607
+msgid "Air Temp"
+msgstr ""
+
+#: info-gtk.c:596
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:390
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:77
+msgid "Apr"
+msgstr ""
+
+#: main.c:78
+msgid "Aug"
+msgstr ""
+
+#: gtk-gui.c:1655
+msgid "Autogroup"
+msgstr ""
+
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
+msgctxt "Depth"
+msgid "Average"
+msgstr ""
+
+#: statistics-gtk.c:97
+msgctxt "Duration"
+msgid "Average"
+msgstr ""
+
+#: statistics-gtk.c:103
+msgctxt "SAC"
+msgid "Average"
+msgstr ""
+
+#: statistics-gtk.c:106
+msgctxt "Temp"
+msgid "Average"
+msgstr ""
+
+#: statistics-gtk.c:562 statistics-gtk.c:599
+msgid "Avg Depth"
+msgstr ""
+
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:570
+msgid "Avg SAC"
+msgstr ""
+
+#: statistics-gtk.c:545
+msgid "Avg Temp"
+msgstr ""
+
+#: statistics-gtk.c:552
+msgid "Avg Time"
+msgstr ""
+
+#: profile.c:426
+#, c-format
+msgid "Bailing out to OC"
+msgstr ""
+
+#: gtk-gui.c:790
+msgid "Bar"
+msgstr ""
+
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
+msgid "Buddy"
+msgstr ""
+
+#: planner-gtk.c:291
+msgid "CC SetPoint"
+msgstr ""
+
+#: planner.c:123
+#, c-format
+msgid "Can't find gas %d/%d"
+msgstr ""
+
+#: parse-xml.c:1953
+#, c-format
+msgid "Can't open stylesheet (%s)/%s"
+msgstr ""
+
+#: uemis-downloader.c:932
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:757
+msgid "Cancelled..."
+msgstr ""
+
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:800
+msgid "Celsius"
+msgstr ""
+
+#: gtk-gui.c:686
+msgid "Choose Default XML File"
+msgstr ""
+
+#: gtk-gui.c:2294
+msgid "Choose XML Files To Import Into Current Data File"
+msgstr ""
+
+#: gtk-gui.c:1622
+msgid "Close"
+msgstr ""
+
+#: divelist-gtk.c:1815
+msgid "Collapse all"
+msgstr ""
+
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:25
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist-gtk.c:1787
+msgid "Create new trip above"
+msgstr ""
+
+#: gtk-gui.c:796
+msgid "CuFt"
+msgstr ""
+
+#: divelist-gtk.c:824 gtk-gui.c:820
+msgid "Cyl"
+msgstr ""
+
+#: equipment.c:982 equipment.c:1093 print.c:201
+msgid "Cylinder"
+msgstr ""
+
+#: planner.c:184
+msgid "Cylinder for planning"
+msgstr ""
+
+#: equipment.c:1603
+msgid "Cylinders"
+msgstr ""
+
+#: profile.c:2145
+#, c-format
+msgid "D:%.1f %s"
+msgstr ""
+
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
+msgid "Date"
+msgstr ""
+
+#: info-gtk.c:821
+msgid "Date and Time"
+msgstr ""
+
+#: info-gtk.c:831
+msgid "Date:"
+msgstr ""
+
+#: main.c:78
+msgid "Dec"
+msgstr ""
+
+#: gtk-gui.c:862
+msgid "Default XML Data File"
+msgstr ""
+
+#: gtk-gui.c:1569
+msgid "Delete a dive computer information entry"
+msgstr ""
+
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
+msgid "Delete dive"
+msgstr ""
+
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
+msgid "Delete dives"
+msgstr ""
+
+#: print.c:502 statistics-gtk.c:92
+msgid "Depth"
+msgstr ""
+
+#: uemis.c:222
+msgid "Depth Limit Exceeded"
+msgstr ""
+
+#: gtk-gui.c:784
+msgid "Depth:"
+msgstr ""
+
+#: gtk-gui.c:1528
+msgid "Device Id"
+msgstr ""
+
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#. <trailing text>
+#: info.c:88
+#, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr ""
+
+#: info.c:130 print.c:83
+#, c-format
+msgid "Dive #%d - "
+msgstr ""
+
+#: libdivecomputer.c:436
+#, c-format
+msgid "Dive %d: %s %d %04d"
+msgstr ""
+
+#: gtk-gui.c:2374
+msgid "Dive Computer Nickname"
+msgstr ""
+
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
+msgid "Dive Info"
+msgstr ""
+
+#: gtk-gui.c:1872
+msgid "Dive Notes"
+msgstr ""
+
+#: planner-gtk.c:360
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
+msgid "Dive Time"
+msgstr ""
+
+#: uemis.c:228
+msgid "Dive Time Alert"
+msgstr ""
+
+#: uemis.c:226
+msgid "Dive Time Info"
+msgstr ""
+
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
+
+#: libdivecomputer.c:681
+msgid "Dive data import error"
+msgstr ""
+
+#: gps.c:214
+msgid "Dive locations"
+msgstr ""
+
+#: info-gtk.c:581
+msgid "Dive master"
+msgstr ""
+
+#: planner-gtk.c:382
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:502
+msgid "Dive#"
+msgstr ""
+
+#: gtk-gui.c:845
+msgid "Divelist Font"
+msgstr ""
+
+#: info-gtk.c:1001
+msgid "Divemaster"
+msgstr ""
+
+#: statistics-gtk.c:542
+msgid "Dives"
+msgstr ""
+
+#: gtk-gui.c:1636
+msgid "Dives Locations"
+msgstr ""
+
+#: download-dialog.c:365
+msgid "Download From Dive Computer"
+msgstr ""
+
+#: gtk-gui.c:1629
+msgid "Download From Dive Computer..."
+msgstr ""
+
+#: webservice.c:260
+msgid "Download From Web Service"
+msgstr ""
+
+#: gtk-gui.c:1630
+msgid "Download From Web Service..."
+msgstr ""
+
+#: webservice.c:31
+msgid "Download Success!"
+msgstr ""
+
+#: print.c:502 statistics-gtk.c:92
+msgid "Duration"
+msgstr ""
+
+#: info-gtk.c:908
+msgid "Duration (min)"
+msgstr ""
+
+#: info.c:312
+msgid "E"
+msgstr ""
+
+#: planner.c:88
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner-gtk.c:263
+msgid "EAN32"
+msgstr ""
+
+#: planner-gtk.c:264
+msgid "EAN36"
+msgstr ""
+
+#: info-gtk.c:99
+msgid "Edit"
+msgstr ""
+
+#: gtk-gui.c:1647
+msgid "Edit Device Names"
+msgstr ""
+
+#: gtk-gui.c:1501
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info-gtk.c:663
+msgid "Edit Trip Info"
+msgstr ""
+
+#: divelist-gtk.c:1680
+msgid "Edit Trip Summary"
+msgstr ""
+
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist-gtk.c:1650
+msgid "Edit dive"
+msgstr ""
+
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
+msgid "Edit dive date/time"
+msgstr ""
+
+#: divelist-gtk.c:1649
+msgid "Edit dives"
+msgstr ""
+
+#: info-gtk.c:539
+msgid "Edit multiple dives"
+msgstr ""
+
+#: info-gtk.c:369
+msgid "Edit trip summary"
+msgstr ""
+
+#: gtk-gui.c:1183
+msgid "Enable / Disable Events"
+msgstr ""
+
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
+msgid "End"
+msgstr ""
+
+#: planner-gtk.c:288
+msgid "Ending Depth"
+msgstr ""
+
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
+msgstr ""
+
+#: gtk-gui.c:1876 info-gtk.c:648
+msgid "Equipment"
+msgstr ""
+
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
+#: libdivecomputer.c:471
+msgid "Error obtaining water salinity"
+msgstr ""
+
+#: libdivecomputer.c:419
+msgid "Error parsing the datetime"
+msgstr ""
+
+#: libdivecomputer.c:441
+msgid "Error parsing the divetime"
+msgstr ""
+
+#: libdivecomputer.c:480
+msgid "Error parsing the gas mix"
+msgstr ""
+
+#: libdivecomputer.c:461
+msgid "Error parsing the gas mix count"
+msgstr ""
+
+#: libdivecomputer.c:451
+msgid "Error parsing the maxdepth"
+msgstr ""
+
+#: libdivecomputer.c:488
+msgid "Error parsing the samples"
+msgstr ""
+
+#: libdivecomputer.c:677
+msgid "Error registering the cancellation handler."
+msgstr ""
+
+#: libdivecomputer.c:410
+msgid "Error registering the data"
+msgstr ""
+
+#: libdivecomputer.c:672
+msgid "Error registering the event handler."
+msgstr ""
+
+#: libdivecomputer.c:645
+#, c-format
+msgid "Event: systime=%<PRId64>, devtime=%u\n"
+msgstr ""
+
+#: libdivecomputer.c:622
+msgid "Event: waiting for user action"
+msgstr ""
+
+#: divelist-gtk.c:1811
+msgid "Expand all"
+msgstr ""
+
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
+msgid "Fahrenheit"
+msgstr ""
+
+#: gtk-gui.c:124
+#, c-format
+msgid "Failed to open %i files."
+msgstr ""
+
+#: parse-xml.c:1599
+#, c-format
+msgid "Failed to parse '%s'"
+msgstr ""
+
+#: parse-xml.c:1598
+#, c-format
+msgid "Failed to parse '%s'.\n"
+msgstr ""
+
+#: file.c:282
+#, c-format
+msgid "Failed to read '%s'"
+msgstr ""
+
+#: file.c:278
+#, c-format
+msgid "Failed to read '%s'.\n"
+msgstr ""
+
+#: main.c:77
+msgid "Feb"
+msgstr ""
+
+#: gtk-gui.c:786
+msgid "Feet"
+msgstr ""
+
+#: gtk-gui.c:1612
+msgid "File"
+msgstr ""
+
+#: gtk-gui.c:1615
+msgid "Filter"
+msgstr ""
+
+#: download-dialog.c:384
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:68
+msgid "Fri"
+msgstr ""
+
+#: gtk-gui.c:1017
+msgid "GFhigh"
+msgstr ""
+
+#: planner-gtk.c:405
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:1007
+msgid "GFlow"
+msgstr ""
+
+#: planner-gtk.c:404
+msgid "GFlow for plan"
+msgstr ""
+
+#: info-gtk.c:559
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#. ++GETTEXT Gas Used is amount used
+#: print.c:203
+msgid "Gas Used"
+msgstr ""
+
+#: statistics-gtk.c:617
+msgctxt "Amount"
+msgid "Gas Used"
+msgstr ""
+
+#: planner-gtk.c:290
+msgctxt "Type of"
+msgid "Gas Used"
+msgstr ""
+
+#: planner.c:570
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:1023 print.c:201
+msgid "Gasmix"
+msgstr ""
+
+#: gtk-gui.c:777
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1617
+msgid "Help"
+msgstr ""
+
+#: webservice.c:296
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
+
+#: divelist-gtk.c:1378 gtk-gui.c:1645
+msgid "Info"
+msgstr ""
+
+#: uemis-downloader.c:769
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1650
+msgid "Input Plan"
+msgstr ""
+
+#: planner-gtk.c:145
+#, c-format
+msgid "Invalid depth - could not parse \"%s\""
+msgstr ""
+
+#: planner-gtk.c:147
+msgid "Invalid depth - values deeper than 400m not supported"
+msgstr ""
+
+#: planner-gtk.c:118
+#, c-format
+msgid "Invalid gas for row %d"
+msgstr ""
+
+#: planner-gtk.c:207
+msgid "Invalid starttime"
+msgstr ""
+
+#: webservice.c:27
+msgid "Invalid user identifier!"
+msgstr ""
+
+#. ++GETTEXT: these are three letter months - we allow up to six code bytes
+#: main.c:77
+msgid "Jan"
+msgstr ""
+
+#: main.c:78
+msgid "Jul"
+msgstr ""
+
+#: main.c:77
+msgid "Jun"
+msgstr ""
+
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
+msgstr ""
+
+#: gtk-gui.c:1643
+msgid "List"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Liter"
+msgstr ""
+
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
+msgid "Location"
+msgstr ""
+
+#: gtk-gui.c:1613
+msgid "Log"
+msgstr ""
+
+#: statistics-gtk.c:99
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+
+#: statistics-gtk.c:553
+msgid "Longest Dive"
+msgstr ""
+
+#: uemis.c:236
+msgid "Low Battery Alert"
+msgstr ""
+
+#: uemis.c:234
+msgid "Low Battery Warning"
+msgstr ""
+
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr ""
+
+#: main.c:77
+msgid "Mar"
+msgstr ""
+
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
+msgid "Mark location here"
+msgstr ""
+
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
+#: uemis.c:230
+msgid "Marker"
+msgstr ""
+
+#: print.c:502
+msgid "Master"
+msgstr ""
+
+#: uemis.c:224
+msgid "Max Deco Time Warning"
+msgstr ""
+
+#: statistics-gtk.c:560 statistics-gtk.c:598
+msgid "Max Depth"
+msgstr ""
+
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:568
+msgid "Max SAC"
+msgstr ""
+
+#: statistics-gtk.c:543
+msgid "Max Temp"
+msgstr ""
+
+#: print.c:109
+#, c-format
+msgid ""
+"Max depth: %.*f %s\n"
+"Duration: %d min\n"
+"%s"
+msgstr ""
+
+#: print.c:377
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1518
+msgid "MaxPress"
+msgstr ""
+
+#: statistics-gtk.c:102
+msgctxt "Depth"
+msgid "Maximum"
+msgstr ""
+
+#: statistics-gtk.c:105
+msgctxt "SAC"
+msgid "Maximum"
+msgstr ""
+
+#: statistics-gtk.c:108
+msgctxt "Temp"
+msgid "Maximum"
+msgstr ""
+
+#: main.c:77
+msgid "May"
+msgstr ""
+
+#: divelist-gtk.c:1641
+msgid "Merge dives"
+msgstr ""
+
+#: divelist-gtk.c:1688
+msgid "Merge trip with trip above"
+msgstr ""
+
+#: divelist-gtk.c:1698
+msgid "Merge trip with trip below"
+msgstr ""
+
+#: gtk-gui.c:785
+msgid "Meter"
+msgstr ""
+
+#: statistics-gtk.c:561
+msgid "Min Depth"
+msgstr ""
+
+#: statistics-gtk.c:569
+msgid "Min SAC"
+msgstr ""
+
+#: statistics-gtk.c:544
+msgid "Min Temp"
+msgstr ""
+
+#: statistics-gtk.c:101
+msgctxt "Depth"
+msgid "Minimum"
+msgstr ""
+
+#: statistics-gtk.c:104
+msgctxt "SAC"
+msgid "Minimum"
+msgstr ""
+
+#: statistics-gtk.c:107
+msgctxt "Temp"
+msgid "Minimum"
+msgstr ""
+
+#: gtk-gui.c:851
+msgid "Misc. Options"
+msgstr ""
+
+#: gtk-gui.c:1523
+msgid "Model"
+msgstr ""
+
+#: main.c:68
+msgid "Mon"
+msgstr ""
+
+#: gtk-gui.c:1286
+msgid "Multi-platform divelog software in C"
+msgstr ""
+
+#: info.c:311
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1618
+msgid "New"
+msgstr ""
+
+#: gtk-gui.c:1238
+msgid "New starting number"
+msgstr ""
+
+#: gtk-gui.c:1649
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1533 gtk-gui.c:2396
+msgid "Nickname"
+msgstr ""
+
+#: uemis.c:232
+msgid "No Tank Data"
+msgstr ""
+
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
+msgid "Notes"
+msgstr ""
+
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
+msgid "Nov"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "OLF"
+msgstr ""
+
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
+#, c-format
+msgid "OTU"
+msgstr ""
+
+#: main.c:78
+msgid "Oct"
+msgstr ""
+
+#: libdivecomputer.c:770
+msgid "Odd pthread error return"
+msgstr ""
+
+#: gtk-gui.c:1580
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
+msgid "Open File"
+msgstr ""
+
+#: gtk-gui.c:1619
+msgid "Open..."
+msgstr ""
+
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:173
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "PO2"
+msgstr ""
+
+#: uemis.c:210
+msgid "PO2 Ascend Alarm"
+msgstr ""
+
+#: uemis.c:208
+msgid "PO2 Ascend Warning"
+msgstr ""
+
+#: uemis.c:205
+msgid "PO2 Green Warning"
+msgstr ""
+
+#: gtk-gui.c:791
+msgid "PSI"
+msgstr ""
+
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1616
+msgid "Planner"
+msgstr ""
+
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
+msgid "Preferences"
+msgstr ""
+
+#: gtk-gui.c:1632
+msgid "Preferences..."
+msgstr ""
+
+#: equipment.c:1002 equipment.c:1008
+msgid "Pressure"
+msgstr ""
+
+#: gtk-gui.c:789
+msgid "Pressure:"
+msgstr ""
+
+#: gtk-gui.c:1648
+msgid "Prev DC"
+msgstr ""
+
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
+msgid "Print only selected dives"
+msgstr ""
+
+#: print.c:974
+msgid "Print selection"
+msgstr ""
+
+#: print.c:939 print.c:946
+msgid "Print type"
+msgstr ""
+
+#: gtk-gui.c:1623
+msgid "Print..."
+msgstr ""
+
+#: gtk-gui.c:1644
+msgid "Profile"
+msgstr ""
+
+#: gtk-gui.c:898
+msgid "Profile Settings"
+msgstr ""
+
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
+msgid "Quit"
+msgstr ""
+
+#: uemis.c:218
+msgid "RGT Alert"
+msgstr ""
+
+#: uemis.c:216
+msgid "RGT Warning"
+msgstr ""
+
+#: info-gtk.c:587 info-gtk.c:1007
+msgid "Rating"
+msgstr ""
+
+#: uemis-downloader.c:364
+#, c-format
+msgid "Reading %s %s"
+msgstr ""
+
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
+msgid "Remove Trip"
+msgstr ""
+
+#: divelist-gtk.c:1805
+msgid "Remove dive from trip"
+msgstr ""
+
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
+msgid "Remove selected dives from trip"
+msgstr ""
+
+#: gtk-gui.c:1229
+msgid "Renumber"
+msgstr ""
+
+#: gtk-gui.c:1633
+msgid "Renumber..."
+msgstr ""
+
+#: download-dialog.c:141
+msgid "Retry"
+msgstr ""
+
+#: info.c:311
+msgid "S"
+msgstr ""
+
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
+#, c-format
+msgid "SAC"
+msgstr ""
+
+#: planner-gtk.c:399
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner-gtk.c:398
+msgid "SAC during dive"
+msgstr ""
+
+#: uemis.c:198
+msgid "Safety Stop Violation"
+msgstr ""
+
+#: main.c:68
+msgid "Sat"
+msgstr ""
+
+#: gtk-gui.c:1621
+msgid "Save As..."
+msgstr ""
+
+#: gtk-gui.c:227
+msgid "Save Changes?"
+msgstr ""
+
+#: divelist-gtk.c:1028 gtk-gui.c:164
+msgid "Save File As"
+msgstr ""
+
+#: divelist-gtk.c:1720
+msgid "Save as"
+msgstr ""
+
+#: gtk-gui.c:1620
+msgid "Save..."
+msgstr ""
+
+#: planner-gtk.c:289
+msgid "Segment Time"
+msgstr ""
+
+#: gtk-gui.c:1174
+msgid "Select Events"
+msgstr ""
+
+#: gtk-gui.c:1638
+msgid "Select Events..."
+msgstr ""
+
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
+msgid "Sep"
+msgstr ""
+
+#: uemis-downloader.c:30
+msgid ""
+"Short write to req.txt file\n"
+"Is the Uemis Zurich plugged in correctly?"
+msgstr ""
+
+#: statistics-gtk.c:98
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+
+#: statistics-gtk.c:554
+msgid "Shortest Dive"
+msgstr ""
+
+#: gtk-gui.c:809 gtk-gui.c:882
+msgid "Show Columns"
+msgstr ""
+
+#: gtk-gui.c:978
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:961
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:994
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:986
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist-gtk.c:1776
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:944
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:925
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:906
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:209
+msgid "Simulated Dive"
+msgstr ""
+
+#: equipment.c:999 equipment.c:1517
+msgid "Size"
+msgstr ""
+
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
+#: uemis.c:200
+msgid "Speed Alarm"
+msgstr ""
+
+#: uemis.c:203
+msgid "Speed Warning"
+msgstr ""
+
+#: equipment.c:1010 equipment.c:1519
+msgid "Start"
+msgstr ""
+
+#: uemis-downloader.c:782
+msgid "Start download"
+msgstr ""
+
+#: statistics-gtk.c:532
+msgid "Statistics"
+msgstr ""
+
+#: statistics-gtk.c:468
+#, c-format
+msgid "Statistics %s"
+msgstr ""
+
+#: gtk-gui.c:1884
+msgid "Stats"
+msgstr ""
+
+#: webservice.c:295
+msgid "Status"
+msgstr ""
+
+#: planner.c:551
+#, c-format
+msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
+#: parse-xml.c:443
+#, c-format
+msgid "Strange percentage reading %s\n"
+msgstr ""
+
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
+msgid "Suit"
+msgstr ""
+
+#. ++GETTEXT: these are three letter days - we allow up to six code bytes
+#: main.c:68
+msgid "Sun"
+msgstr ""
+
+#: statistics-gtk.c:592
+msgid "Surf Intv"
+msgstr ""
+
+#: planner-gtk.c:383
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:562
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:960
+msgid "Table print"
+msgstr ""
+
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
+#: uemis.c:220
+msgid "Tank Change Suggested"
+msgstr ""
+
+#: uemis.c:214
+msgid "Tank Pressure Info"
+msgstr ""
+
+#: gtk-gui.c:880
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:815
+msgid "Temp"
+msgstr ""
+
+#: statistics-gtk.c:92
+msgid "Temperature"
+msgstr ""
+
+#: gtk-gui.c:799
+msgid "Temperature:"
+msgstr ""
+
+#: gtk-gui.c:1646
+msgid "Three"
+msgstr ""
+
+#: main.c:68
+msgid "Thu"
+msgstr ""
+
+#: info-gtk.c:838
+msgid "Time"
+msgstr ""
+
+#: gtk-gui.c:1768
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1656
+msgid "Toggle Zoom"
+msgstr ""
+
+#: planner.c:286
+msgid "Too many gas mixes"
+msgstr ""
+
+#: planner-gtk.c:317
+msgid "Too many waypoints"
+msgstr ""
+
+#: statistics-gtk.c:96
+msgctxt "Duration"
+msgid "Total"
+msgstr ""
+
+#: statistics-gtk.c:551
+msgid "Total Time"
+msgstr ""
+
+#: print.c:340
+#, c-format
+msgid "Total Weight:"
+msgstr ""
+
+#: planner.c:542
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:583
+#, 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)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main.c:68
+msgid "Tue"
+msgstr ""
+
+#: equipment.c:1516 equipment.c:1544
+msgid "Type"
+msgstr ""
+
+#: uemis-downloader.c:28
+msgid ""
+"Uemis Zurich: File System is almost full\n"
+"Disconnect/reconnect the dive computer\n"
+"and click 'Retry'"
+msgstr ""
+
+#: uemis-downloader.c:29
+msgid ""
+"Uemis Zurich: File System is full\n"
+"Disconnect/reconnect the dive computer\n"
+"and try again"
+msgstr ""
+
+#: uemis-downloader.c:771
+msgid "Uemis init failed"
+msgstr ""
+
+#: libdivecomputer.c:699
+msgid "Unable to create libdivecomputer context"
+msgstr ""
+
+#: libdivecomputer.c:404
+#, c-format
+msgid "Unable to create parser for %s %s"
+msgstr ""
+
+#: libdivecomputer.c:701
+#, c-format
+msgid "Unable to open %s %s (%s)"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Units"
+msgstr ""
+
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
+msgid "Use right click to mark dive location at cursor"
+msgstr ""
+
+#: webservice.c:282 webservice.c:333
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1642
+msgid "User Manual"
+msgstr ""
+
+#: gtk-gui.c:1614
+msgid "View"
+msgstr ""
+
+#: info-gtk.c:593 statistics-gtk.c:600
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:794
+msgid "Volume:"
+msgstr ""
+
+#: info.c:312
+msgid "W"
+msgstr ""
+
+#: planner-gtk.c:162
+msgid "Warning - extremely long dives can cause long calculation time"
+msgstr ""
+
+#: planner-gtk.c:137
+msgid "Warning - planning very deep dives can take excessive amounts of time"
+msgstr ""
+
+#: statistics-gtk.c:606
+msgid "Water Temp"
+msgstr ""
+
+#: webservice.c:163
+msgid "Webservice"
+msgstr ""
+
+#: main.c:68
+msgid "Wed"
+msgstr ""
+
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
+msgid "Weight"
+msgstr ""
+
+#: equipment.c:1148 print.c:308
+#, c-format
+msgid "Weight System"
+msgstr ""
+
+#: gtk-gui.c:804
+msgid "Weight:"
+msgstr ""
+
+#: gtk-gui.c:152
+msgid "XML file"
+msgstr ""
+
+#: statistics-gtk.c:92
+msgid "Year"
+msgstr ""
+
+#: gtk-gui.c:1634 statistics-gtk.c:295
+msgid "Yearly Statistics"
+msgstr ""
+
+#: gtk-gui.c:2382
+#, c-format
+msgid ""
+"You already have a dive computer of this model\n"
+"named %s\n"
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
+msgstr ""
+
+#: gtk-gui.c:237
+msgid ""
+"You have unsaved changes\n"
+"Would you like to save those before closing the datafile?"
+msgstr ""
+
+#: gtk-gui.c:240 gtk-gui.c:243
+#, c-format
+msgid ""
+"You have unsaved changes to file: %s \n"
+"Would you like to save those before closing the datafile?"
+msgstr ""
+
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
+#, c-format
+msgid "air"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "airtime"
+msgstr ""
+
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
+msgid "ankle"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "ascent"
+msgstr ""
+
+#: equipment.c:893
+msgid "backplate weight"
+msgstr ""
+
+#: dive.c:48
+msgid "bar"
+msgstr ""
+
+#: equipment.c:891
+msgid "belt"
+msgstr ""
+
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
+msgid "bookmark"
+msgstr ""
+
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "ceiling"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "ceiling (safety stop)"
+msgstr ""
+
+#: equipment.c:894
+msgid "clip-on"
+msgstr ""
+
+#: dive.c:93 planner.c:951
+msgid "cuft"
+msgstr ""
+
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "deco stop"
+msgstr ""
+
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "deepstop"
+msgstr ""
+
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "divetime"
+msgstr ""
+
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:780
+msgid "ean"
+msgstr ""
+
+#: statistics.c:263
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:259
+#, c-format
+msgid "for dive #%d"
+msgstr ""
+
+#: statistics.c:217
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:261
+#, c-format
+msgid "for selected dive"
+msgstr ""
+
+#: statistics.c:224
+#, c-format
+msgid "for selected dives"
+msgstr ""
+
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
+msgid "ft"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
+msgid "gaschange"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "heading"
+msgstr ""
+
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
+msgid "integrated"
+msgstr ""
+
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
+#: libdivecomputer.c:171
+msgid "invalid event number"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
+msgid "kg"
+msgstr ""
+
+#: dive.c:88
+msgid "l"
+msgstr ""
+
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
+msgid "lbs"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
+msgid "m"
+msgstr ""
+
+#: gtk-gui.c:966
+msgid "max ppO2"
+msgstr ""
+
+#: divelist-gtk.c:828 gtk-gui.c:893
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "maxdepth"
+msgstr ""
+
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist-gtk.c:820 planner.c:957
+msgid "min"
+msgstr ""
+
+#: libdivecomputer.c:630
+#, c-format
+msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
+msgstr ""
+
+#: uemis-downloader.c:409
+msgid "more data dive id"
+msgstr ""
+
+#: statistics.c:198
+#, c-format
+msgid "more than %d days"
+msgstr ""
+
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "none"
+msgstr ""
+
+#: gtk-gui.c:949
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:931
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:912
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:44
+msgid "pascal"
+msgstr ""
+
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
+msgid "psi"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "rbt"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "rgbm"
+msgstr ""
+
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "safety stop"
+msgstr ""
+
+#: libdivecomputer.c:151
+msgid "safety stop (mandatory)"
+msgstr ""
+
+#: libdivecomputer.c:151
+msgid "safety stop (voluntary)"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "surface"
+msgstr ""
+
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
+#: libdivecomputer.c:154
+msgid "tissue level warning"
+msgstr ""
+
+#: statistics.c:22
+msgid "training"
+msgstr ""
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
+msgid "translator-credits"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "transmitter"
+msgstr ""
+
+#: equipment.c:1409 equipment.c:1429
+msgid "unkn"
+msgstr ""
+
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
+msgid "unknown"
+msgstr ""
+
+#: equipment.c:540
+msgid "unspecified"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "violation"
+msgstr ""
+
+#: equipment.c:1545
+msgid "weight"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "workload"
+msgstr ""
+
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/de_CH.po b/po/de_CH.po
index 3bd921884..23acbc91b 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -1,40 +1,37 @@
-# German translations for Subsurface package
-# Swiss German messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Dirk Hohndel <dirk@hohndel.org>, 2012.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# dirkhh <dirk@hohndel.org>, 2012
 # Martin Gysel <me@bearsh.org>, 2012
-#
+# bearsh <me@bearsh.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-25 17:32-0800\n"
-"Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
-"Language-Team: German\n"
-"Language: de\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/subsurface/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Basepath: ..\n"
-"X-Generator: Poedit 1.5.5\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Keine Ereignisse\n"
+msgstr "\nKeine Ereignisse\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Monat"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr " herunterladen"
 
@@ -42,17 +39,17 @@ msgstr " herunterladen"
 msgid " Please select dive computer and device. "
 msgstr " Bitte Tauchcomputer und Anschluss auswählen. "
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr " Anfang"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr " Ende"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "Nr."
 
@@ -66,52 +63,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %dh %dmin"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
@@ -121,185 +119,167 @@ msgstr "%dh %dmin"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Berechneter tiefster Deko-Stopp %.0f %s"
+msgstr "%s\nBerechneter tiefster Deko-Stopp %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko:%umin @ %.0f %s"
+msgstr "%s\nDeko:%umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko:unbk Zeit @ %.0f %s"
+msgstr "%s\nDeko:unbk Zeit @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"In Deko"
+msgstr "%s\nIn Deko"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"D:%d %s"
+msgstr "%s\nD:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Sicherheitsstopp:%umin @ %.0f %s"
+msgstr "%s\nSicherheitsstopp:%umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Sicherheitsstopp:unbk Zeit @ %.0f %s"
+msgstr "%s\nSicherheitsstopp:unbk Zeit @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface Tauchplan\n"
-"basierend auf GFlow = %.0f und GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface Tauchplan\nbasierend auf GFlow = %.0f und GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
 msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
 
-#: dive.c:918
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) oder (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr ""
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr ""
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(keine Tauchgänge)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(nichts)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 cuft/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 cuft/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 Tauchgänge pro Seite"
 
@@ -307,67 +287,78 @@ msgstr "2 Tauchgänge pro Seite"
 msgid "2 pcs full suit"
 msgstr "Zweiteiler"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "3m Stufen für berechnete Deko-Stopps"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 Tauchgänge pro Seite"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
-msgstr ""
-"<small>Segmente hier hinzufügen.\n"
-"Jede Zeile beschreibt einen Abschnitt des geplanten Tauchgangs.\n"
-"Ein Eintrag mit Tiefe, Zeit und Atemgas beschreibt einen Abschnitt, der auf der angegeben Tiefe endet, die angegebene Zeit dauert (falls relativ, also '+3:30') oder zur angegebenen Zeit endet (falls absolut) und der das angegebene Atemgas verwendet.\n"
-"Keine Gasangabe bedeutet 'benutze vorheriges Atemgas' (oder Luft, falls kein Atemgas spezifiziert wurde).\n"
-"Ein Eintrag mit Tiefe und Atemgas aber keiner Zeitangabe dient einem besonderen Zweck: er informiert den Plan-Algorithmus, dass das angegebene Atemgas für den Aufstieg verfügbar ist sobald die angegebene Tiefe erreicht ist.\n"
-"CC SetPoint ist fuer geschlossene Kreislaufgeräte; bitte nicht ausfüllen für Tauchgänge mit offenem Tauchgerät.</small>\n"
-
-#: planner.c:1198
+msgstr "<small>Segmente hier hinzufügen.\nJede Zeile beschreibt einen Abschnitt des geplanten Tauchgangs.\nEin Eintrag mit Tiefe, Zeit und Atemgas beschreibt einen Abschnitt, der auf der angegeben Tiefe endet, die angegebene Zeit dauert (falls relativ, also '+3:30') oder zur angegebenen Zeit endet (falls absolut) und der das angegebene Atemgas verwendet.\nKeine Gasangabe bedeutet 'benutze vorheriges Atemgas' (oder Luft, falls kein Atemgas spezifiziert wurde).\nEin Eintrag mit Tiefe und Atemgas aber keiner Zeitangabe dient einem besonderen Zweck: er informiert den Plan-Algorithmus, dass das angegebene Atemgas für den Aufstieg verfügbar ist sobald die angegebene Tiefe erreicht ist.\nCC SetPoint ist fuer geschlossene Kreislaufgeräte; bitte nicht ausfüllen für Tauchgänge mit offenem Tauchgerät.</small>\n"
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "Luft"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "Info zu Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Tauchgang hinzufügen..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Tauchgang hinzufügen"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Zur obigen Reise hinzufügen"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Weiteren Abschnitt hinzufügen"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Luftdruck"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Lufttemp."
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Lufttemp. in %s"
@@ -376,77 +367,86 @@ msgstr "Lufttemp. in %s"
 msgid "Always prefer downloaded dive"
 msgstr "Immer heruntergeladene Tauchgänge bevorzugen"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Apr"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Automatisch gruppieren"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Ø Tiefe"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Ø Tiefe (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Ø SAC"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Ø Temp"
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Ø Dauer"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Notausstieg mit offenem System"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Partner"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC SetPoint"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Kann Gasgemisch %d/%d nicht finden"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Fehler beim Öffnen des Styleshhets (%s)/%s"
@@ -459,121 +459,143 @@ msgstr "Abgebrochen, beende..."
 msgid "Cancelled..."
 msgstr "Abgebrochen..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Verstehe die Antwort nicht!"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Standard XML-Datei auswählen"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 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:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Schliessen"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Alle einfalten"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Verbindungsfehler: "
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Neue Reise darüber einfügen"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Flasche"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Flasche"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Flasche für Tauchplanung"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Flaschen"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "T:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Datum und Zeit"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Dez"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Standard XML Datei"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Lösche die Informationen zu einem Tauchcomputer"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Tauchgang löschen"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Tauchgänge löschen"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Tiefe"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Tiefe (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Tiefenlimit überschritten"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Tiefe:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Gerätebezeichnung"
 
@@ -581,13 +603,18 @@ msgstr "Gerätebezeichnung"
 msgid "Device or mount point"
 msgstr "Gerät oder Einhängepunkt"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Tauchgang #%d - "
@@ -597,23 +624,27 @@ msgstr "Tauchgang #%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Tauchgang Nr. %d: %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Bezeichnung für den Tauchcomputer"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Informationen"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Notizen"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Tauchplan - DIES IST NUR EINE SUMULATION; NICHT ZUM TAUCHEN VERWENDEN"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Dauer"
 
@@ -633,15 +664,15 @@ msgstr "Hersteller und Modell"
 msgid "Dive data import error"
 msgstr "Fehler beim Importieren der Tauchgangsdaten"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Tauchplätze"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Tauchguide"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Wann beginnt der Tauchgang?"
 
@@ -649,19 +680,19 @@ msgstr "Wann beginnt der Tauchgang?"
 msgid "Dive#"
 msgstr "Tauchgang Nr."
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Schriftart für Tauchliste"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Tauchguide"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Tauchgänge"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Tauchplätze"
 
@@ -669,111 +700,123 @@ msgstr "Tauchplätze"
 msgid "Download From Dive Computer"
 msgstr "Von Tauchcomputer laden"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Von Tauchcomputer laden..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Vom Webserver laden"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Vom Webserver laden..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Erfolgreich geladen!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Dauer"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Dauer (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "O"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Gerätename bearbeiten"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Tauchcomputer Bezeichnung bearbeiten"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Reise-Informationen bearbeiten"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Reise-Übersicht bearbeiten"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Der Name des Tauchcomputers kann durch Doppelklick bearbeitet werden"
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Tauchgang bearbeiten"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Zeit des Tauchgangs bearbeiten"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Tauchgänge bearbeiten"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Mehrere Tauchgänge bearbeiten"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Reise-Übersicht bearbeiten"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Ereignisse Ein-/Ausblenden"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Ende"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Tiefe am Ende"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Benutzerkennung eingeben und 'Laden' drücken. Bei Erfolg 'Anwenden' drücken um die Daten zu übernehmen."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Ausrüstung"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Fehler beim Lesen des Salzgehalts"
@@ -823,52 +866,64 @@ msgstr "Ereignis: systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Ereignis: warte auf Benutzeraktion"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Alle ausfalten"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Fehler beim Öffnen von %i Dateien"
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Fehler beim Lesen von '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Fehler beim Lesen von '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Fuss"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Datei"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filter"
 
@@ -876,27 +931,27 @@ msgstr "Filter"
 msgid "Force download of all dives"
 msgstr "Erzwinge erneutes Laden aller Tauchgänge"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Fr"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh für Tauchplan"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow für Tauchplan"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (WGS84 oder GPS Format)"
 
@@ -905,42 +960,42 @@ msgstr "GPS (WGS84 oder GPS Format)"
 msgid "Gas Used"
 msgstr "Gasverbrauch"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Gasverbrauch"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Verw. Gas"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Gasverbrauch:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Gasgemisch"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Allg. Einstellungen"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Hilfe"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "inaktiv"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "XML Datei(en) einlesen..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Informationen"
 
@@ -948,71 +1003,75 @@ msgstr "Informationen"
 msgid "Init Communication"
 msgstr "Verbindung aufbauen"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Plan eingeben"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Ungültige Tiefe - kann \"%s\" nicht lesen"
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Ungültige Tiefe - Werte unterhalb 400m sind nicht unterstützt"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Ungültiges Gasgemisch in Zeile %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Ungültige Anfangszeit"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Ungültige Benutzerkennung"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Jan"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Liter"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Ort"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Max."
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Längster Tauchgang"
 
@@ -1024,14 +1083,26 @@ msgstr "Alarm: Batterie schwach"
 msgid "Low Battery Warning"
 msgstr "Warnung: Batterie schwach"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Kartenanbieter"
+
+#: main.c:77
 msgid "Mar"
 msgstr "Mär"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Hier markieren"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Markierung"
@@ -1044,15 +1115,20 @@ msgstr "Guide"
 msgid "Max Deco Time Warning"
 msgstr "Warnung: Maximale Deko Zeit"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Max. Tiefe"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Max. Tiefe (%s):"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Max. SAC"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Max. Temp."
 
@@ -1062,115 +1138,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Max. Tiefe: %.*f %s\n"
-"Dauer: %d min\n"
-"%s"
+msgstr "Max. Tiefe: %.*f %s\nDauer: %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Max. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Max. Druck"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Max."
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Mai"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Tauchgänge zusammenführen"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Reise mit der darüber verbinden"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Reise mit der darunter verbinden"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Meter"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Min. Tiefe"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Min. SAC"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min. Temp."
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Min."
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Verschiedene Optionen"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Modell"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Mo"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Multi-Plattform Tauchprogramm in C"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Neu"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Neue erste Nummer"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Nächster TC"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Gerätename"
 
@@ -1178,11 +1251,24 @@ msgstr "Gerätename"
 msgid "No Tank Data"
 msgstr "Keine Flaschen Informationen"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Notizen"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
 msgstr "Nov"
 
@@ -1190,12 +1276,12 @@ msgstr "Nov"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Okt"
 
@@ -1203,18 +1289,31 @@ msgstr "Okt"
 msgid "Odd pthread error return"
 msgstr "Unbekannter pthread Fehlercode"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Ausgewählten Eintrag löschen?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Öffnen..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr "Reihenfolge"
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1236,63 +1335,86 @@ msgstr "Warnung: Aufstieg / PO₂"
 msgid "PO2 Green Warning"
 msgstr "Warnung: PO₂ Grün"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "psi"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr "Passwort"
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Auf Karte auswählen"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Planer"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Druck"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Druck:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Vorh. TC"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr "In Farbe drucken"
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Nur ausgewählte Tauchgänge drucken"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Auswahl drucken"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Art des Ausdrucks"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Drucken..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Profil Einstellungen"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Beenden"
 
@@ -1304,7 +1426,7 @@ msgstr "Alarm: verbleibende Gas-Zeit"
 msgid "RGT Warning"
 msgstr "Warnung: verbleibende Gas-Zeit"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Bewertung"
 
@@ -1313,23 +1435,31 @@ msgstr "Bewertung"
 msgid "Reading %s %s"
 msgstr "Lese %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Reise entfernen"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Tauchgang aus Reise entfernen"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Neu nummerieren"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Neu nummerieren..."
 
@@ -1337,20 +1467,21 @@ msgstr "Neu nummerieren..."
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC während Dekostopp"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "SAC während des Tauchgangs"
 
@@ -1358,43 +1489,47 @@ msgstr "SAC während des Tauchgangs"
 msgid "Safety Stop Violation"
 msgstr "Verletzung des Sicherheitsstopps"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Sa"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Änderungen speichern?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Datei speichern unter"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Speichern unter"
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Speichern..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Segment Dauer"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Ereignisse auswählen"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Ereignisse auswählen..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
 msgid "Sep"
 msgstr "Sep"
 
@@ -1402,65 +1537,68 @@ msgstr "Sep"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Unvollständiger Schreibvorgang der req.txt Datei\n"
-"Ist der Uemis Zürich korrekt verbunden?"
+msgstr "Unvollständiger Schreibvorgang der req.txt Datei\nIst der Uemis Zürich korrekt verbunden?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Min."
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Kürzester Tauchgang"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Spalten anzeigen"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "EAD, END, EADD anzeigen"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "MOD anzeigen"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Berechnete tiefste Deko-Stopps anzeigen"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Vom TC ausgelesene tiefste Deko-Stopps rot anzeigen"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Auf Karte zeigen"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "pHe Diagramm anzeigen"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "pN%s Diagramm anzeigen"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "pO%s Diagramm anzeigen"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Simulierter Tauchgang"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Grösse"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: Geschwindigkeit"
@@ -1469,7 +1607,7 @@ msgstr "Alarm: Geschwindigkeit"
 msgid "Speed Warning"
 msgstr "Warnung: Geschwindigkeit"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Start"
 
@@ -1477,59 +1615,63 @@ msgstr "Start"
 msgid "Start download"
 msgstr "Beginne zu Laden"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Statistiken %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Statistiken"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Status"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Unverständliche Prozentangabe %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Anzug"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "So"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Oberflächenpause"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Oberflächendruck (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Gaswechsel zu %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Tabellendruck"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Gaswechsel-Vorschlag"
@@ -1538,60 +1680,58 @@ msgstr "Gaswechsel-Vorschlag"
 msgid "Tank Pressure Info"
 msgstr "Info: Flaschendruck"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Tec-Einstellungen"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temperatur"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Drei"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Do"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Zeit"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Zum Tauchgangsdaten bearbeiten\n"
-"Doppelklick in der Tauchgangsliste"
+msgstr "Zum Tauchgangsdaten bearbeiten\nDoppelklick in der Tauchgangsliste"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Zoom ein-/ausschalten"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Zu viele Gasgemische"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Zu viele Abschnitte"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Gesamt"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Gesamtzeit"
 
@@ -1600,24 +1740,24 @@ msgstr "Gesamtzeit"
 msgid "Total Weight:"
 msgstr "Gesamtgewicht:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Auftauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgang)"
 msgstr[1] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Di"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Typ"
 
@@ -1626,20 +1766,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zürich: Dateisystem beinahe voll\n"
-"Bitte den Tauchcomputer ausstecken, wieder einstecken\n"
-"und erneut versuchen"
+msgstr "Uemis Zürich: Dateisystem beinahe voll\nBitte den Tauchcomputer ausstecken, wieder einstecken\nund erneut versuchen"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zürich: Dateisystem voll.\n"
-"Bitte den Tauchcomputer ausstecken, wieder einstecken\n"
-"und erneut versuchen"
+msgstr "Uemis Zürich: Dateisystem voll.\nBitte den Tauchcomputer ausstecken, wieder einstecken\nund erneut versuchen"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1659,115 +1793,119 @@ msgstr "Nicht in der Lage, einen Parser für %s %s zu erstellen"
 msgid "Unable to open %s %s (%s)"
 msgstr "Fehler beim Öffnen von %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Einheiten"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr "Zu divelogs.de hochladen"
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr "Lade zu divelogs.de hoch..."
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Der Tauchplatz kann mittels rechter Maustaste an der Mausposition markiert werden"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Benutzerkennung"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Benutzerhandbuch"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Ansicht"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Sicht"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "W"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Warnung - extrem lange Tauchgänge können zu sehr langen Berechnungszeiten führen"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Warnung - extrem tiefe Tauchgänge können zu sehr langen Berechnungszeiten führen"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Wassertemperatur"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Webservice"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Mi"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Gewicht"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Gewichtsystem"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML-Datei"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Jahr"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Jahresstatistiken"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Sie haben bereits einen Tauchcomputer dieses Modells\n"
-"mit Namen %s.\n"
-"Subsurface kann einen Namen für dieses Gerät verwalten, um die Geräte zu unterscheiden. Die Voreinstellung ist unten angezeigt.\n"
-"Falls kein Name gewünscht ist, bitte 'Abbrechen' klicken. Subsurface zeigt dann einfach den Produktnamen an (in diesem Fall können eventuell verschiedene Tauchcomputer nicht mehr in den angezeigten Daten unterschieden werden)."
+msgstr "Sie haben bereits einen Tauchcomputer dieses Modells\nmit Namen %s.\nSubsurface kann einen Namen für dieses Gerät verwalten, um die Geräte zu unterscheiden. Die Voreinstellung ist unten angezeigt.\nFalls kein Name gewünscht ist, bitte 'Abbrechen' klicken. Subsurface zeigt dann einfach den Produktnamen an (in diesem Fall können eventuell verschiedene Tauchcomputer nicht mehr in den angezeigten Daten unterschieden werden)."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Nicht alle Änderungen wurden gespeichert.\n"
-"Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
+msgstr "Nicht alle Änderungen wurden gespeichert.\nSollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Nicht alle Änderungen in der Datei %s wurden gespeichert.\n"
-"Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
+msgstr "Nicht alle Änderungen in der Datei %s wurden gespeichert.\nSollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "Luft"
@@ -1776,7 +1914,11 @@ msgstr "Luft"
 msgid "airtime"
 msgstr "verbleibende Atemzeit"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "Fussblei"
 
@@ -1784,22 +1926,34 @@ msgstr "Fussblei"
 msgid "ascent"
 msgstr "Aufstieg"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "Backplate-Gewicht"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "Gürtel"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr "Boot"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "Markierung"
 
+#: statistics.c:21
+msgid "cave"
+msgstr "Höhle"
+
+#: statistics.c:20
+msgid "cavern"
+msgstr "Kaverne"
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "tiefster Deko-Stopp"
@@ -1808,11 +1962,11 @@ msgstr "tiefster Deko-Stopp"
 msgid "ceiling (safety stop)"
 msgstr "Sicherheits-Stopp"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "cuft"
 
@@ -1824,6 +1978,10 @@ msgstr "Daten"
 msgid "deco stop"
 msgstr "Deko-Stopp"
 
+#: statistics.c:20
+msgid "deep"
+msgstr "Tief"
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "Tiefen-Stopp"
@@ -1840,40 +1998,48 @@ msgstr "Tauchplatz Daten ID"
 msgid "divetime"
 msgstr "Tauchgangsdauer"
 
+#: statistics.c:20
+msgid "drift"
+msgstr "Strömung"
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "Trockentauchanzug"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "für alle Tauchgänge"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "für Tauchgang Nr. %d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "für Tauchgänge Nr."
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "für den ausgewählten Tauchgang"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "für die ausgewählten Tauchgänge"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr "Süsswasser"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1889,10 +2055,18 @@ msgstr "Gaswechsel"
 msgid "heading"
 msgstr "Richtung"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr "Eis"
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integriert"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "ungültige Ereignisnummer"
@@ -1901,15 +2075,19 @@ msgstr "ungültige Ereignisnummer"
 msgid "jacket"
 msgstr "Jacke"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr "See"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "US Pfund"
 
@@ -1917,15 +2095,15 @@ msgstr "US Pfund"
 msgid "long john"
 msgstr "Latzhose"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "max. ppO₂"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "max. CNS"
 
@@ -1937,7 +2115,7 @@ msgstr "Max. Tiefe"
 msgid "membrane"
 msgstr "Membran"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1950,11 +2128,15 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "mehr Daten für Tauchgang ID"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "mehr als %d Tage"
 
+#: statistics.c:22
+msgid "night"
+msgstr "Nacht"
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "Nullzeit"
@@ -1963,25 +2145,33 @@ msgstr "Nullzeit"
 msgid "none"
 msgstr "keine"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "pHe Schwelle"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "pN%s Schwelle"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "pO%s Schwelle"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "Pa"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr "Foto"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "Pool"
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1993,6 +2183,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr "Fluss"
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "Sicherheitsstopp"
@@ -2009,6 +2203,10 @@ msgstr "Sicherheitsstopp (freiwillig)"
 msgid "semidry"
 msgstr "halbtrocken"
 
+#: statistics.c:20
+msgid "shore"
+msgstr "Ufer"
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "Shorty"
@@ -2017,26 +2215,34 @@ msgstr "Shorty"
 msgid "surface"
 msgstr "Oberfläche"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Gewebewarnung"
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1075
+#: statistics.c:22
+msgid "training"
+msgstr "Übung"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
-msgstr ""
-"Dirk Hohndel\n"
-"Martin Gysel"
+msgstr "Dirk Hohndel\nMartin Gysel"
 
 #: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "Sender"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "unbk"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -2048,11 +2254,15 @@ msgstr "nicht angegeben"
 msgid "vest"
 msgstr "Weste"
 
+#: statistics.c:23
+msgid "video"
+msgstr "Video"
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "Verletzung"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "Gewicht"
 
@@ -2064,66 +2274,6 @@ msgstr "Nass-Tauchanzug"
 msgid "workload"
 msgstr "Arbeit"
 
-#~ msgid "1 dive per page"
-#~ msgstr "1 Tauchgang pro Seite"
-
-#~ msgid "About"
-#~ msgstr "Info"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Automatisch die Tauchgänge gruppieren"
-
-#~ msgid "Delete"
-#~ msgstr "Löschen"
-
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Tiefe\n"
-#~ "Ø"
-
-#~ msgid "Dive details"
-#~ msgstr "Notizen zum Tauchgang"
-
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Dauer\n"
-#~ "Gesamt"
-
-#~ msgid "Pretty print"
-#~ msgstr "Schön drucken"
-
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "AMV\n"
-#~ "Ø"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "\n"
-#~ "Min."
-
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Temperatur\n"
-#~ "Ø"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP Datei"
-
-#~ msgid "deco"
-#~ msgstr "Deko"
+#: statistics.c:21
+msgid "wreck"
+msgstr "Wrack"
diff --git a/po/de_DE.po b/po/de_DE.po
index d48a76a19..3964d171d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,38 +1,36 @@
-# German translations for Subsurface package
-# German messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Dirk Hohndel <dirk@hohndel.org>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# dirkhh <dirk@hohndel.org>, 2012-2013
+# bearsh <me@bearsh.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-25 17:33-0800\n"
-"Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
-"Language-Team: German\n"
-"Language: de\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 18:00+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: German (Germany) (http://www.transifex.com/projects/p/subsurface/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Basepath: ..\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Keine Ereignisse\n"
+msgstr "\nKeine Ereignisse\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Monat"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr " herunterladen"
 
@@ -40,17 +38,17 @@ msgstr " herunterladen"
 msgid " Please select dive computer and device. "
 msgstr " Bitte Tauchcomputer und Anschluß auswählen. "
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr " Anfang"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr " Ende"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "Nr."
 
@@ -64,52 +62,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dt %dst %dmin"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dst %dmin"
@@ -119,185 +118,167 @@ msgstr "%dst %dmin"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Berechneter tiefster Deko-Stopp %.0f %s"
+msgstr "%s\nBerechneter tiefster Deko-Stopp %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko:%umin @ %.0f %s"
+msgstr "%s\nDeko:%umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko:unbk Zeit @ %.0f %s"
+msgstr "%s\nDeko:unbk Zeit @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"In Deko"
+msgstr "%s\nIn Deko"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"D:%d %s"
+msgstr "%s\nD:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Sicherheitsstopp:%umin @ %.0f %s"
+msgstr "%s\nSicherheitsstopp:%umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Sicherheitsstopp:unbk Zeit @ %.0f %s"
+msgstr "%s\nSicherheitsstopp:unbk Zeit @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface Tauchplan\n"
-"basierend auf GFlow = %.0f und GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface Tauchplan\nbasierend auf GFlow = %.0f und GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr "%s Ereignis (%d:%02u)"
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr "%s: Antwort von divelogs.de"
 
-#: dive.c:918
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) oder (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(um Datum/Zeit zu bearbeiten hier klicken)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(um Datum/Zeit/Tiefe zu bearbeiten hier kilcken)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(keine Tauchgänge)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(nichts)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 cu.ft./min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 cu.ft./min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 Tauchgänge pro Seite"
 
@@ -305,67 +286,78 @@ msgstr "2 Tauchgänge pro Seite"
 msgid "2 pcs full suit"
 msgstr "Zweiteiler"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "3m Stufen für berechnete Deko-Stopps"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 Tauchgänge pro Seite"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
-msgstr ""
-"<small>Segmente hier hinzufügen.\n"
-"Jede Zeile beschreibt einen Abschnitt des geplanten Tauchgangs.\n"
-"Ein Eintrag mit Tiefe, Zeit und Atemgas beschreibt einen Abschnitt, der auf der angegeben Tiefe endet, die angegebene Zeit dauert (falls relativ, also '+3:30') oder zur angegebenen Zeit endet (falls absolut) und der das angegebene Atemgas verwendet.\n"
-"Keine Gasangabe bedeutet 'benutze vorheriges Atemgas' (oder Luft, falls kein Atemgas spezifiziert wurde).\n"
-"Ein Eintrag mit Tiefe und Atemgas aber keiner Zeitangabe dient einem besonderen Zweck: er informiert den Plan-Algorithmus, dass das angegebene Atemgas für den Aufstieg verfügbar ist sobald die angegebene Tiefe erreicht ist.\n"
-"CC SetPoint ist fuer geschlossene Kreislaufgeräte; bitte nicht ausfüllen für Tauchgänge mit offenem Tauchgerät.</small>\n"
-
-#: planner.c:1198
+msgstr "<small>Abschnitte des Tauchgangs hier hinzufügen.\nJede Zeile beschreibt einen Teil des geplanten Tauchgangs.\nEin Eintrag mit Tiefe, Dauer und Gas bestimmt einen Abschnitt der auf der angegebenen Tiefe ended, die angegebene Dauer hat (oder zur angegebenen Zeit endet, wenn absolut definiert: '@5:00') und das angegebene Gas benutzt.\nEin leerer Eintrag für Gas bedeutet \"benutze das vorherige Gas\" (oder LUFT falls kein Gas spezifiziert war).\nEin Eintrag der eine Tiefe und ein Gas angibt, aber keine Dauer ist ein Hinweis für den Algorithmus, dass beim Aufstieg auf dieser Tiefe ein Wechsel zum angegebenen Gas geplant ist.\nCC SetPoint ist für Tauchgänge mit Kreislaufgeräten gedacht, bitte für Tauchgänge mit traditioneller Ausrüstung leer lassen.\n"
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "Luft"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "Info zu Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr "Setze"
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Tauchgang hinzufügen..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr "Markierung hier setzen"
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Tauchgang hinzufügen"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr "Gaswechsel hier setzen"
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr "Gaswechsel setzen bei %d:%02u"
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Zur obigen Reise hinzufügen"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Weiteren Abschnitt hinzufügen"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Luftdruck"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Lufttemp."
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Lufttemp. in %s"
@@ -374,77 +366,86 @@ msgstr "Lufttemp. in %s"
 msgid "Always prefer downloaded dive"
 msgstr "Immer heruntergeladene Tauchgänge bevorzugen"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Apr"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Automatisch gruppieren"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr "Verfügbare Gase"
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Ø Tiefe"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Ø Tiefe (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Ø AMV"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Ø Temp"
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Ø Dauer"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Notausstieg mit offenem System"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Partner"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC SetPoint"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Kann Gasgemisch %d/%d nicht finden"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Fehler beim Öffnen des Styleshhets (%s)/%s"
@@ -457,121 +458,143 @@ msgstr "Abgebrochen, beende..."
 msgid "Cancelled..."
 msgstr "Abgebrochen..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr "Kann keinen Gaswechsel setzen"
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Verstehe die Antwort nicht!"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Standard XML-Datei auswählen"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 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:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Schließen"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Alle einfalten"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr "Kommunikations Fehler mit divelogs.de"
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Verbindungsfehler: "
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Neue Reise darüber einfügen"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Flasche"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Flasche"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Flasche für Tauchplanung"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Flaschen"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "T:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr "Datenbank Verbindung fehlgeschlagen '%s'.\n"
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr "Datenbank Anfrage fehlgeschlagen '%s'.\n"
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr "Datenbank Anfrage 'get_events' fehlgeschlagen.\n"
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Datum und Zeit"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Dez"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Standard XML Datei"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Lösche die Informationen zu einem Tauchcomputer"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Tauchgang löschen"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Tauchgänge löschen"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Tiefe"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Tiefe (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Tiefenbegrenzung überschritten"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Tiefe:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Gerätebezeichnung"
 
@@ -579,13 +602,18 @@ msgstr "Gerätebezeichnung"
 msgid "Device or mount point"
 msgstr "Gerät oder Mount-Point"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr "Ungültige Tauchgänge anzeigen"
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Tauchgang #%d - "
@@ -595,23 +623,27 @@ msgstr "Tauchgang #%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Tauchgang Nr. %d: %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Bezeichnung für den Tauchcomputer"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Informationen"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Notizen"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Tauchplan - DIES IST NUR EINE SUMULATION; NICHT ZUM TAUCHEN VERWENDEN"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr "Tauchgangs-Typ"
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Dauer"
 
@@ -631,15 +663,15 @@ msgstr "Hersteller und Modell"
 msgid "Dive data import error"
 msgstr "Fehler beim Importieren der Tauchgangsdaten"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Tauchplätze"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Tauchgruppenleiter"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Wann beginnt der Tauchgang?"
 
@@ -647,19 +679,19 @@ msgstr "Wann beginnt der Tauchgang?"
 msgid "Dive#"
 msgstr "Tauchgang Nr."
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Schriftart für Tauchliste"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Tauchgruppenleiter"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Tauchgänge"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Tauchplätze"
 
@@ -667,111 +699,123 @@ msgstr "Tauchplätze"
 msgid "Download From Dive Computer"
 msgstr "Von Tauchcomputer laden"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Von Tauchcomputer laden..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Vom Webserver laden"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Vom Webserver laden..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Erfolgreich geladen!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Dauer"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Dauer (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "O"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Gerätename bearbeiten"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Tauchcomputer Bezeichnung bearbeiten"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Reise-Informationen bearbeiten"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Reise-Übersicht bearbeiten"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Der Name des Tauchcomputers kann durch Doppelklick bearbeitet werden"
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Tauchgang bearbeiten"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Zeit des Tauchgangs bearbeiten"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Tauchgänge bearbeiten"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Mehrere Tauchgänge bearbeiten"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Reise-Übersicht bearbeiten"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Ereignisse Ein-/Ausblenden"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr "An- / Abwählen von Tauchgangs-Typen"
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Ende"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Tiefe am Ende"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Benutzerkennung eingeben und 'Laden' drücken. Bei Erfolg 'Anwenden' drücken um die Daten zu übernehmen."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Ausrüstung"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr "Fehler"
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Fehler beim Lesen des Salzgehalts"
@@ -821,52 +865,64 @@ msgstr "Ereignis: systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Ereignis: warte auf Benutzeraktion"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Alle ausfalten"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr "Als UDDF Datei exportieren"
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr "UDDF Exportieren..."
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr "Tauchgang(gänge) als UDDF exportieren"
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Fehler beim Öffnen von %i Dateien"
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Fehler beim Lesen von '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Fehler beim Lesen von '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Fuß"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Datei"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filter"
 
@@ -874,27 +930,27 @@ msgstr "Filter"
 msgid "Force download of all dives"
 msgstr "Erzwinge erneutes Laden aller Tauchgänge"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Fr"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh für Tauchplan"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow für Tauchplan"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (WGS84 oder GPS Format)"
 
@@ -903,42 +959,42 @@ msgstr "GPS (WGS84 oder GPS Format)"
 msgid "Gas Used"
 msgstr "Gasverbrauch"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Gasverbrauch"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Verw. Gas"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Gasverbrauch:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Gasgemisch"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Allg. Einstellungen"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Hilfe"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "inaktiv"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "XML Datei(en) einlesen..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr "Datei(en) importieren..."
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Informationen"
 
@@ -946,71 +1002,75 @@ msgstr "Informationen"
 msgid "Init Communication"
 msgstr "Verbindung aufbauen"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Plan eingeben"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Ungültige Tiefe - kann \"%s\" nicht lesen"
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Ungültige Tiefe - Werte unterhalb 400m sind nicht unterstützt"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Ungültiges Gasgemisch in Zeile %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Ungültige Anfangszeit"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Ungültige Benutzerkennung"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Jan"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr "Layout Einstellungen"
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Liter"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Ort"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Max."
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Längster Tauchgang"
 
@@ -1022,14 +1082,26 @@ msgstr "Alarm: Batterie schwach"
 msgid "Low Battery Warning"
 msgstr "Warnung: Batterie schwach"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Karten-Anbieter"
+
+#: main.c:77
 msgid "Mar"
 msgstr "Mär"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr "Als ungültig markieren"
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Hier markieren"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr "Als gültig markieren"
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Markierung"
@@ -1042,15 +1114,20 @@ msgstr "Leiter"
 msgid "Max Deco Time Warning"
 msgstr "Warnung: Maximale Deko Zeit"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Max. Tiefe"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Max. Tiefe (%s):"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Max. AMV"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Max. Temp."
 
@@ -1060,115 +1137,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Max. Tiefe: %.*f %s\n"
-"Dauer: %d min\n"
-"%s"
+msgstr "Max. Tiefe: %.*f %s\nDauer: %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Max. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Max. Druck"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Max."
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Mai"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Tauchgänge zusammenführen"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Reise mit der darüber verbinden"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Reise mit der darunter verbinden"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Meter"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Min. Tiefe"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Min. AMV"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min. Temp."
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Min."
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Verschiedene Optionen"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Modell"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Mo"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Multi-Plattform Tauchprogramm in C"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Neu"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Neue erste Nummer"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Nächster TC"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Gerätename"
 
@@ -1176,11 +1250,24 @@ msgstr "Gerätename"
 msgid "No Tank Data"
 msgstr "Keine Flaschen Informationen"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr "Keine Flaschen für diesen Tauchgang"
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Notizen"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr "Höhe der Notizen (%d%% - %d%%)"
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr "Notizen oben"
+
+#: main.c:78
 msgid "Nov"
 msgstr "Nov"
 
@@ -1188,12 +1275,12 @@ msgstr "Nov"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Okt"
 
@@ -1201,18 +1288,31 @@ msgstr "Okt"
 msgid "Odd pthread error return"
 msgstr "Unbekannter pthread Fehlercode"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Ausgewählten Eintrag löschen?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr "Nur Tauchgänge dieses Typs anzeigen:"
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Öffnen..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr "Reihenfolge"
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr "Höhe der anderen Daten (%d%% - %d%%)"
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1234,63 +1334,86 @@ msgstr "Warnung: Aufstieg / PO2"
 msgid "PO2 Green Warning"
 msgstr "Warnung: PO2 Grün"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "psi"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr "Passwort"
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Auf Karte auswählen"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Planer"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr "Bitte Benutzerkennung und Passwort für divelogs.de eingeben. Die ausgewählten Tauchgänge werden zum Benutzerkonto hinzugefügt."
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Druck"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Druck:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Vorh. TC"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr "Farbdruck"
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Nur ausgewählte Tauchgänge drucken"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Auswahl drucken"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Art des Ausdrucks"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Drucken..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Profil Einstellungen"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr "Höhe des Profils (%d%% - %d%%)"
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr "Profil oben"
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Beenden"
 
@@ -1302,7 +1425,7 @@ msgstr "Alarm: verbleibende Gas-Zeit"
 msgid "RGT Warning"
 msgstr "Warnung: verbleibende Gas-Zeit"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Bewertung"
 
@@ -1311,23 +1434,31 @@ msgstr "Bewertung"
 msgid "Reading %s %s"
 msgstr "Lese %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr "Entferne"
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Reise entfernen"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Tauchgang aus Reise entfernen"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr "Entferne Ereignisse hier"
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Neu nummerieren"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Neu nummerieren..."
 
@@ -1335,20 +1466,21 @@ msgstr "Neu nummerieren..."
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "AMV"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "AMV während Dekostopp"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "AMV während des Tauchgangs"
 
@@ -1356,43 +1488,47 @@ msgstr "AMV während des Tauchgangs"
 msgid "Safety Stop Violation"
 msgstr "Verletzung des Sicherheitsstopps"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Sa"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Änderungen speichern?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Datei speichern unter"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Speichern unter"
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Speichern..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Segment Dauer"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Ereignisse auswählen"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Ereignisse auswählen..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr "Typen auswählen..."
+
+#: main.c:78
 msgid "Sep"
 msgstr "Sep"
 
@@ -1400,65 +1536,68 @@ msgstr "Sep"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Unvollständiger Schreibvorgang der req.txt Datei\n"
-"Ist der Uemis Zürich korrekt verbunden?"
+msgstr "Unvollständiger Schreibvorgang der req.txt Datei\nIst der Uemis Zürich korrekt verbunden?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Min."
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Kürzester Tauchgang"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Spalten anzeigen"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "EAD, END, EADD anzeigen"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "MOD anzeigen"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Berechnete tiefste Deko-Stopps anzeigen"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Vom TC ausgelesene tiefste Deko-Stopps rot anzeigen"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Auf Karte zeigen"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "pHe Diagramm anzeigen"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "pN%s Diagramm anzeigen"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "pO%s Diagramm anzeigen"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Simulierter Tauchgang"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Größe"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr "Höhe (%% des Layouts)"
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: Geschwindigkeit"
@@ -1467,7 +1606,7 @@ msgstr "Alarm: Geschwindigkeit"
 msgid "Speed Warning"
 msgstr "Warnung: Geschwindigkeit"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Start"
 
@@ -1475,59 +1614,63 @@ msgstr "Start"
 msgid "Start download"
 msgstr "Beginne zu Laden"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Statistiken %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Statistiken"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Status"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Unverständliche Prozentangabe %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Anzug"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "So"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Oberflächenpause"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Oberflächendruck (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Gaswechsel zu %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Tabellendruck"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr "Tauchgang-Typen werden nur angezeigt, wenn sie in allen editierten Tauchgängen identisch waren"
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Gaswechsel-Vorschlag"
@@ -1536,60 +1679,58 @@ msgstr "Gaswechsel-Vorschlag"
 msgid "Tank Pressure Info"
 msgstr "Info: Flaschendruck"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Tec-Einstellungen"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temperatur"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Drei"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Do"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Zeit"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Zum Tauchgangsdaten bearbeiten\n"
-"Doppelklick in der Tauchgangsliste"
+msgstr "Zum Tauchgangsdaten bearbeiten\nDoppelklick in der Tauchgangsliste"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Zoom ein-/ausschalten"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Zu viele Gasgemische"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Zu viele Abschnitte"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Gesamt"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Gesamtzeit"
 
@@ -1598,24 +1739,24 @@ msgstr "Gesamtzeit"
 msgid "Total Weight:"
 msgstr "Gesamtgewicht:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Auftauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgang)"
 msgstr[1] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Di"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Typ"
 
@@ -1624,20 +1765,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zürich: Dateisystem beinahe voll\n"
-"Bitte den Tauchcomputer ausstecken, wieder einstecken\n"
-"und erneut versuchen"
+msgstr "Uemis Zürich: Dateisystem beinahe voll\nBitte den Tauchcomputer ausstecken, wieder einstecken\nund erneut versuchen"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zürich: Dateisystem voll.\n"
-"Bitte den Tauchcomputer ausstecken, wieder einstecken\n"
-"und erneut versuchen"
+msgstr "Uemis Zürich: Dateisystem voll.\nBitte den Tauchcomputer ausstecken, wieder einstecken\nund erneut versuchen"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1657,115 +1792,119 @@ msgstr "Nicht in der Lage, einen Parser für %s %s zu erstellen"
 msgid "Unable to open %s %s (%s)"
 msgstr "Fehler beim Öffnen von %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Einheiten"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr "Tauchgang(gänge) auf divelogs.de hochladen"
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr "Auf divelogs.de hochladen"
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr "Hochladen auf divelogs.de..."
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Der Tauchplatz kann mittels rechter Maustaste an der Mausposition markiert werden"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Benutzerkennung"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Benutzerhandbuch"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Ansicht"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Sicht"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "W"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Warnung - extrem lange Tauchgänge können zu sehr langen Berechnungszeiten führen"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Warnung - extrem tiefe Tauchgänge können zu sehr langen Berechnungszeiten führen"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Wassertemperatur"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Webservice"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Mi"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Gewicht"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Gewichtsystem"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML-Datei"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Jahr"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Jahresstatistiken"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Sie haben bereits einen Tauchcomputer dieses Modells\n"
-"mit Namen %s.\n"
-"Subsurface kann einen Namen für dieses Gerät verwalten, um die Geräte zu unterscheiden. Die Voreinstellung ist unten angezeigt.\n"
-"Falls kein Name gewünscht ist, bitte 'Abbrechen' klicken. Subsurface zeigt dann einfach den Produktnamen an (in diesem Fall können eventuell verschiedene Tauchcomputer nicht mehr in den angezeigten Daten unterschieden werden)."
+msgstr "Sie haben bereits einen Tauchcomputer dieses Modells\nmit Namen %s.\nSubsurface kann einen Namen für dieses Gerät verwalten, um die Geräte zu unterscheiden. Die Voreinstellung ist unten angezeigt.\nFalls kein Name gewünscht ist, bitte 'Abbrechen' klicken. Subsurface zeigt dann einfach den Produktnamen an (in diesem Fall können eventuell verschiedene Tauchcomputer nicht mehr in den angezeigten Daten unterschieden werden)."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Nicht alle Änderungen wurden gespeichert.\n"
-"Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
+msgstr "Nicht alle Änderungen wurden gespeichert.\nSollen Änderungen vor dem Schließen der Datei gespeichert werden?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Nicht alle Änderungen in der Datei %s wurden gespeichert.\n"
-"Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
+msgstr "Nicht alle Änderungen in der Datei %s wurden gespeichert.\nSollen Änderungen vor dem Schließen der Datei gespeichert werden?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "Luft"
@@ -1774,7 +1913,11 @@ msgstr "Luft"
 msgid "airtime"
 msgstr "verbleibende Atemzeit"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr "Berg"
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "Fußblei"
 
@@ -1782,22 +1925,34 @@ msgstr "Fußblei"
 msgid "ascent"
 msgstr "Aufstieg"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "Backplate-Gewicht"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "Gürtel"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr "Boot"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "Markierung"
 
+#: statistics.c:21
+msgid "cave"
+msgstr "Höhle"
+
+#: statistics.c:20
+msgid "cavern"
+msgstr "Kaverne"
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "tiefster Deko-Stopp"
@@ -1806,11 +1961,11 @@ msgstr "tiefster Deko-Stopp"
 msgid "ceiling (safety stop)"
 msgstr "Sicherheits-Stopp"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "cu.ft."
 
@@ -1822,6 +1977,10 @@ msgstr "Daten"
 msgid "deco stop"
 msgstr "Deko-Stopp"
 
+#: statistics.c:20
+msgid "deep"
+msgstr "tief"
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "Tiefen-Stopp"
@@ -1838,40 +1997,48 @@ msgstr "Tauchplatz Daten ID"
 msgid "divetime"
 msgstr "Tauchgangsdauer"
 
+#: statistics.c:20
+msgid "drift"
+msgstr "Strömung"
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "Trockentauchanzug"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "für alle Tauchgänge"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "für Tauchgang Nr. %d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "für Tauchgänge Nr."
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "für den ausgewählten Tauchgang"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "für die ausgewählten Tauchgänge"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr "Süsswasser"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1887,10 +2054,18 @@ msgstr "Gaswechsel"
 msgid "heading"
 msgstr "Richtung"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr "Eis"
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integriert"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr "ungültig"
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "ungültige Ereignisnummer"
@@ -1899,15 +2074,19 @@ msgstr "ungültige Ereignisnummer"
 msgid "jacket"
 msgstr "Jacke"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr "See"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "US Pfund"
 
@@ -1915,15 +2094,15 @@ msgstr "US Pfund"
 msgid "long john"
 msgstr "Latzhose"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "max. ppO2"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "max. CNS"
 
@@ -1935,7 +2114,7 @@ msgstr "Max. Tiefe"
 msgid "membrane"
 msgstr "Membran"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1948,11 +2127,15 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "mehr Daten für Tauchgang ID"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "mehr als %d Tage"
 
+#: statistics.c:22
+msgid "night"
+msgstr "Nacht"
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "Nullzeit"
@@ -1961,25 +2144,33 @@ msgstr "Nullzeit"
 msgid "none"
 msgstr "keine"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "pHe Schwelle"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "pN%s Schwelle"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "pO%s Schwelle"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "Pa"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr "Foto"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "Pool"
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1991,6 +2182,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr "Fluss"
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "Sicherheitsstopp"
@@ -2007,6 +2202,10 @@ msgstr "Sicherheitsstopp (freiwillig)"
 msgid "semidry"
 msgstr "halbtrocken"
 
+#: statistics.c:20
+msgid "shore"
+msgstr "Ufer"
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "Shorty"
@@ -2015,12 +2214,21 @@ msgstr "Shorty"
 msgid "surface"
 msgstr "Oberfläche"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr "Lehr"
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Gewebewarnung"
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1075
+#: statistics.c:22
+msgid "training"
+msgstr "Übung"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
 msgstr "Dirk Hohndel"
 
@@ -2028,11 +2236,12 @@ msgstr "Dirk Hohndel"
 msgid "transmitter"
 msgstr "Sender"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "unbk"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -2044,11 +2253,15 @@ msgstr "nicht angegeben"
 msgid "vest"
 msgstr "Weste"
 
+#: statistics.c:23
+msgid "video"
+msgstr "Video"
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "Verletzung"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "Blei"
 
@@ -2060,66 +2273,6 @@ msgstr "Nass-Tauchanzug"
 msgid "workload"
 msgstr "Arbeit"
 
-#~ msgid "1 dive per page"
-#~ msgstr "1 Tauchgang pro Seite"
-
-#~ msgid "About"
-#~ msgstr "Info"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Automatisch die Tauchgänge gruppieren"
-
-#~ msgid "Delete"
-#~ msgstr "Löschen"
-
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Tiefe\n"
-#~ "Ø"
-
-#~ msgid "Dive details"
-#~ msgstr "Notizen zum Tauchgang"
-
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Dauer\n"
-#~ "Gesamt"
-
-#~ msgid "Pretty print"
-#~ msgstr "Schön drucken"
-
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "AMV\n"
-#~ "Ø"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "\n"
-#~ "Min."
-
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Temperatur\n"
-#~ "Ø"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP Datei"
-
-#~ msgid "deco"
-#~ msgstr "Deko"
+#: statistics.c:21
+msgid "wreck"
+msgstr "Wrack"
diff --git a/po/es_ES.po b/po/es_ES.po
index fab1cb0f7..4a5f34722 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,40 +1,36 @@
-# Spanish translations for Subsurface package 
-# Spanish messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 2012
+# Salvador Cuñat <salvador.cunat@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-26 16:42+0100\n"
-"Last-Translator: Salvador Cuñat <salvador.cunat@gmail.com>\n"
-"Language-Team: Spanish\n"
-"Language: es\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/subsurface/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Basepath: ../\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"No hay eventos\n"
+msgstr "\nNo hay eventos\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr "> Mes"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr "Descargar"
 
@@ -42,17 +38,17 @@ msgstr "Descargar"
 msgid " Please select dive computer and device. "
 msgstr " Por favor, seleccione el ordenador de buceo y el dispositivo."
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr "comienzo"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr "fin"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "#"
 
@@ -66,52 +62,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s de %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d minutos"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd, %dh %dmin"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
@@ -121,185 +118,167 @@ msgstr "%dh %dmin"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Techo calculado %.0f %s"
+msgstr "%s\nTecho calculado %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:%umin @ %.0f %s"
+msgstr "%s\nDeco:%umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:Tiempo desconocido @ %.0f %s"
+msgstr "%s\nDeco:Tiempo desconocido @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"PEA:%d%s\n"
-"PNE:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nPEA:%d%s\nPNE:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"En deco"
+msgstr "%s\nEn deco"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Parada de seguridad:%umin @ %.0f %s"
+msgstr "%s\nParada de seguridad:%umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Parada de seguridad:tiempo desconocido @ %.0f %s"
+msgstr "%s\nParada de seguridad:tiempo desconocido @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Plan de buceo de Subsurface\n"
-"basado en GFbajo = %.0f  y  GFalto = %.0f\n"
-"\n"
+msgstr "%s\nPlan de buceo de Subsurface\nbasado en GFbajo = %.0f  y  GFalto = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr "Suceso: %s en %d:%02u"
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
 msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
 
-#: dive.c:918
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) o (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(click para editar fecha/hora)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(click para editar día/hora/profundidad)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(ninguna inmersión)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(nada)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 pie³/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 pie³/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 inmersiones por página"
 
@@ -307,67 +286,78 @@ msgstr "2 inmersiones por página"
 msgid "2 pcs full suit"
 msgstr "traje completo 2 piezas"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "Incrementos de 3m para el techo calculado"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 inmersiones por página"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
-msgstr ""
-"<small>Añadir segmentos abajo.\n"
-"Cada linea describe parte de la inmersión planificada.\n"
-"Una entrada con profundidad, tiempo y gas describe un segmento que termina a la profundidad dada, dura el tiempo señalado (si es relativo, por ejemplo '+3:30') o termina en el momento marcado (si es absoluto), y consume el gas indicado.\n"
-"Un gas vacío significa 'utilizar el gas anterior' (o AIRE si no se había especificado ninguno).\n"
-"Una entrada que tenga profundidad y gas pero no tiempo es especial; informa al planificador de que el gas especificado está disponible para el ascenso una vez que se haya alcanzado la profundidad indicada.\n"
-"CC Setpoint especifica inmersiones con CC (rebreather), dejar vacio para circuito abierto.</small>\n"
-
-#: planner.c:1198
+msgstr "<small>Añadir segmentos debajo.\nCada línea describe parte de la inmersión planificada.\nUna entrada con profundidad, tiempo y gas describe un segmento que termina a la profundidad indicada, dura el tiempo señalado (si es tiempo relativo, por ejemplo '+3:30') o termina en el momento marcado (si es tiempo absoluto, por ejemplo, '@5:00'), y consume el gas dado.\nUn gas vacío significa 'utilizar el gas anterior' (o AIRE si no se especificó ninguno).\nUna entrada que tenga una profundidad y un gas, pero no tenga tiempo, es especial;  informa al planificador de que el gas indicado está disponible para el ascenso, una vez que se haya alcanzado la profundidad marcada.\nCC Setpoint especifica inmersiones con circuito cerrado (rebreather), dejar vacío para circuito abierto.</small>\n"
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "AIRE"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "Sobre Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr "Añadir"
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Añadir inmersión ..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr "Añadir marca aquí"
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Añadir inmersión"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr "Añadir cambio de gas aquí"
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr "Añadir cambio de gas en %d:%02u"
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Añadir al viaje anterior"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Añadir punto de ruta"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Presión atmosférica"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Temperatura del aire"
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Temperatura del aire en %s"
@@ -376,77 +366,86 @@ msgstr "Temperatura del aire en %s"
 msgid "Always prefer downloaded dive"
 msgstr "Preferir siempre la inmersión descargada"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Abr"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Auto Agrupar"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr "Gases disponibles"
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Promedio"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Prof. media"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Prof. Media (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "SAC medio"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Temp media"
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Tiempo medio"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Cambio de emergencia a OC"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "Bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Compañero"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC SetPoint"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "No encuentro el gas %d/%d"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "No se puede abrir el fichero (%s)/%s"
@@ -459,121 +458,143 @@ msgstr "Cancelado, saliendo ..."
 msgid "Cancelled..."
 msgstr "Cancelado..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr "No se puede añadir cambio de gas"
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "¡ No puedo analizar la respuesta !"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Seleccionar archivo XML predeterminado"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Elegir archivos XML para importar en archivo de datos actual"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Cerrar"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Contraer todo"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Conectando ..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Error de conexión:"
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Crear nuevo viaje por encima"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "pie^3"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Bot"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Botella"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Botella para planificar"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Botellas"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "D:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "DESCARGO DE RESPONSABILIDAD / AVISO:  ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO BUHLMANN Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA.   RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr "Falló la conexión a la base de datos '%s'.\n"
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr "Falló la petición a la base de datos '%s'.\n"
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr "Falló la petición get_events a la base de datos.\n"
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Fecha"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Fecha:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Dic"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Archivo XML por defecto"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Borrar la información de un ordenador"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Eliminar inmersión"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Eliminar inmersiones"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Profundidad"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Profundidad (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Superado límite de profundidad"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Profundidad:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Identificador de dispositivo"
 
@@ -581,13 +602,18 @@ msgstr "Identificador de dispositivo"
 msgid "Device or mount point"
 msgstr "Dispositivo o punto de montaje"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr "Mostrar las inmersiones marcadas \"no validas\""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Inmersión #%1$d - %2$s %3$02d/%4$02d/%5$04d a las %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Inmersión #%1$d - %2$s %3$02d/%4$02d/%5$04d a las %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Inmersión #%d -"
@@ -597,23 +623,27 @@ msgstr "Inmersión #%d -"
 msgid "Dive %d: %s %d %04d"
 msgstr "Inmersión #%d:%s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Nombre del ordenador de Buceo"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Información de la inmersión"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Notas de la inmersión"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Plan de Inmersión - ESTO ES SOLO UNA SIMULACIÓN;  NO UTILIZAR PARA BUCEAR"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr "Etiquetas para la inmersión"
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Duración de la inmersión"
 
@@ -633,15 +663,15 @@ msgstr "Fabricante del ordenador y producto"
 msgid "Dive data import error"
 msgstr "Error al importar datos de inmersiones"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Ubicaciones de buceo"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Guía"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "¿ Cuando comienza la inmersión ?"
 
@@ -649,19 +679,19 @@ msgstr "¿ Cuando comienza la inmersión ?"
 msgid "Dive#"
 msgstr "Inmersión #"
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Fuente de lista de inmersiones"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Inmersiones"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Ubicaciones de buceo"
 
@@ -669,111 +699,123 @@ msgstr "Ubicaciones de buceo"
 msgid "Download From Dive Computer"
 msgstr "Descargar desde el ordenador de Buceo"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Descargar desde el ordenador de Buceo..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Descargar desde servicio web"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Descargar desde servicio web ..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "¡ Descarga completa !"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Duración"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Duración (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "E"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Editar"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr " Editar nombres del dispositivo"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Editar nombres de ordenador de buceo"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Editar el viaje"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Editar resumen del viaje"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Edita el nombre de un ordenador de buceo haciendo doble-clic en el campo del nombre correspondiente."
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Editar inmersión"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Editar fecha y hora de la inmersión"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Editar inmersiones"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Editar múltiples inmersiones"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Editar resumen del viaje"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Activar / Desactivar eventos"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr "Activar/Desactivar Etiquetas"
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Fin"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Profundidad final"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Introduce un identificador de usuario y pulsa \"Descargar\".  Cuando la descarga esté completa puedes pulsar \"Aplicar\" si deseas aplicar los cambios."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Equipo"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Error al obtener salinidad del agua"
@@ -823,52 +865,64 @@ msgstr "Evento: Hora de sistema=%<PRId64>, Hora del dispositivo=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Evento: esperando acción del usuario"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Expandir todos"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr "Exportar como fichero UDDF"
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr "Exportar a UDDF ..."
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr "Exportar inmersión(es) a UDDF"
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "No se pudo abrir los %i archivos."
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "No se pudo analizar '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "No se pudo analizar '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "No se pudo leer '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "No se pudo leer '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Pies"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Archivo"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filtros"
 
@@ -876,27 +930,27 @@ msgstr "Filtros"
 msgid "Force download of all dives"
 msgstr "Forzar descarga de todas las inmersiones"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Vi"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFAlto"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFalto para planificar"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFbajo"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFbajo para planificar"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS(formato WGS84 o GPS)"
 
@@ -905,42 +959,42 @@ msgstr "GPS(formato WGS84 o GPS)"
 msgid "Gas Used"
 msgstr "Gas usado"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Gas usado"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Gas usado"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Consumo de gas:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Mezcla de gas"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Ajustes generales"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Ayuda"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "parado"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Importar Archivo(s) XML..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr "Importar Fichero(s)"
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Info"
 
@@ -948,71 +1002,75 @@ msgstr "Info"
 msgid "Init Communication"
 msgstr "Iniciar comunicación"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Introducir Plan"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Profundidad no valida - No puede analizarse \"%s\""
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Profundidad no valida - No están soportadas profundidades superiores a 400m"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Gas no válido en columna %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Hora de inicio no valida"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "¡ Identificador de usuario no válido !"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Ene"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr "Opciones de Distribución"
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel y otros, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Lista"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Litro"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Ubicación"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Más Prolongado"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Inmersión más prolongada"
 
@@ -1024,14 +1082,26 @@ msgstr "Alerta de Batería Baja"
 msgid "Low Battery Warning"
 msgstr "Advertencia de Batería Baja"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Proveedor de mapas"
+
+#: main.c:77
 msgid "Mar"
 msgstr "Mar"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr "Marcar como no valida"
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Marcar ubicación aquí"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr "Marcar como valida"
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Marcador"
@@ -1044,15 +1114,20 @@ msgstr "Guía"
 msgid "Max Deco Time Warning"
 msgstr "Advertencia de tiempo max deco"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Profundidad max"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Prof. Máxima (%s)"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Max SAC"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Max. Temp."
 
@@ -1062,115 +1137,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Profundidad Máxima: %.*f %s\n"
-"Duración :%d minutos\n"
-"%s"
+msgstr "Profundidad Máxima: %.*f %s\nDuración :%d minutos\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Max. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Pres. max."
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Máxima"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Máximo"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Máxima"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Mayo"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Mezclar inmersiones"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Combinar viaje con el viaje de encima"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Combinar viaje con el viaje de abajo"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Metro"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Profundidad mínima"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Min SAC"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min Temp"
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Mínima"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Mínima"
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Opciones Varias"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Modelo"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Lu"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Software multi-plataforma escrito en C para DiveLog"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Nuevo"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Nuevo número de partida"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Siguiente DC"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Nombre"
 
@@ -1178,11 +1250,24 @@ msgstr "Nombre"
 msgid "No Tank Data"
 msgstr "No se degistran datos de botella"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr "No se han especificado botellas para esta inmersión."
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Notas"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr "Altura de las notas (%d%% - %d%%)"
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr "Notas arriba"
+
+#: main.c:78
 msgid "Nov"
 msgstr "Nov"
 
@@ -1190,12 +1275,12 @@ msgstr "Nov"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Oct"
 
@@ -1203,18 +1288,31 @@ msgstr "Oct"
 msgid "Odd pthread error return"
 msgstr "Error de lectura"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "¿ OK a borrar la entrada seleccionada ?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr "Mostrar solo inmersiones con estas etiquetas:"
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Abrir archivo"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Abrir..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr "Ordenar"
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr "Altura de los otros datos (%d%% - %d%%)"
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1236,63 +1334,86 @@ msgstr "Aviso de Ascenso PpO2"
 msgid "PO2 Green Warning"
 msgstr "Aviso Verde PpO2"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "PSI"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr "Contraseña"
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Elegir en el mapa"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Planificador"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr "Por favor, introduce tu código de usuario y contraseña en divelogs.de. Las inmersiones seleccionadas serán añadidas a tu cuenta."
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Presión"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Presión:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Anterior DC"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr "Impresión en color"
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Imprimir sólo inmersiones seleccionadas"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Imprimir selección"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Tipo de impresión"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Perfil"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Ajustes de perfil"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr "Altura del perfil (%d%% - %d%%)"
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr "Perfil arriba"
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Salir"
 
@@ -1304,7 +1425,7 @@ msgstr "Alerta tiempo de gas restante"
 msgid "RGT Warning"
 msgstr "Aviso tiempo de gas restante"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Valoración"
 
@@ -1313,23 +1434,31 @@ msgstr "Valoración"
 msgid "Reading %s %s"
 msgstr "Leyendo %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr "Eliminar"
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Eliminar viaje"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Eliminar inmersión del viaje"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr "Eliminar evento"
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Eliminar selección de inmersiones del viaje"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Renumerar"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Renumerar..."
 
@@ -1337,20 +1466,21 @@ msgstr "Renumerar..."
 msgid "Retry"
 msgstr "Intentar de nuevo"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC en parada deco"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "SAC en fondo"
 
@@ -1358,43 +1488,47 @@ msgstr "SAC en fondo"
 msgid "Safety Stop Violation"
 msgstr "Violación de parada de seguridad"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Sa"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "¿Guardar cambios?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Guardar Archivo Como"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Guardar como..."
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Guardar..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Duración del segmento"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Seleccionar eventos"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Seleccionar eventos..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr "Seleccionar etiquetas ..."
+
+#: main.c:78
 msgid "Sep"
 msgstr "Sep"
 
@@ -1402,65 +1536,68 @@ msgstr "Sep"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Escritura al archivo req.txt muy corta.\n"
-"¿Está el Uemis Zúrich correctamente conectado?"
+msgstr "Escritura al archivo req.txt muy corta.\n¿Está el Uemis Zúrich correctamente conectado?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Más corta"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Inmersión más corta"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Mostrar Columnas"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Mostrar PEA, PNE, EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Mostrar MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Mostrar el techo calculado"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Mostrar en rojo el techo informado por el dc"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Mostrar en el mapa"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Mostrar gráfico de pHe"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Mostrar gráfico de pN%s"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Mostrar gráfico de pO%s"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Inmersión simulada"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Tamaño"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarma de Velocidad"
@@ -1469,7 +1606,7 @@ msgstr "Alarma de Velocidad"
 msgid "Speed Warning"
 msgstr "Advertencia de velocidad`"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Inicio"
 
@@ -1477,59 +1614,63 @@ msgstr "Inicio"
 msgid "Start download"
 msgstr "Comenzar descarga"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Estadísticas %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Estadísticas"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Estado"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u en %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Porcentaje extraño al leer %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Traje"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "Do"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Interv. Superf."
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Presión atmosférica (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Cambio de gas a %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Impresión de tabla"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr "Las etiquetas solo se muestran si son idénticas para todas las inmersiones editadas"
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Sugerencia de cambio de botella"
@@ -1538,60 +1679,58 @@ msgstr "Sugerencia de cambio de botella"
 msgid "Tank Pressure Info"
 msgstr "Información sobre presión de botella"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Opciones técnicas"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Todo"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Ju"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
-msgstr "Tiempo"
+msgstr "Hora de entrada"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Para editar la información de la inmersión\n"
-"haz doble-clic sobre ella en la lista."
+msgstr "Para editar la información de la inmersión\nhaz doble-clic sobre ella en la lista."
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Activar / Desactivar Zoom"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Demasiadas mezclas de gas"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Demasiados puntos de ruta"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Tiempo total"
 
@@ -1600,24 +1739,24 @@ msgstr "Tiempo total"
 msgid "Total Weight:"
 msgstr "Peso total:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Cambio de cota a %.*f %s en %d:%02d min - runtime %d:%02u con %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Viaje %1$s, %2$s %3$d, %4$d (%5$d inmersión)"
 msgstr[1] "Viaje %1$s, %2$s %3$d, %4$d (%5$d inmersiones)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Ma"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Tipo"
 
@@ -1626,20 +1765,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: El sistema de archivos esta casi lleno \n"
-"Desconecte / conecte el ordenador de buceo \n"
-"e inténtelo de nuevo"
+msgstr "Uemis Zurich: El sistema de archivos esta casi lleno \nDesconecte / conecte el ordenador de buceo \ne inténtelo de nuevo"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: sistema de archivos está lleno\n"
-"Desconectar / conectar el ordenador de buceo\n"
-"e inténtelo de nuevo"
+msgstr "Uemis Zurich: sistema de archivos está lleno\nDesconectar / conectar el ordenador de buceo\ne inténtelo de nuevo"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1659,114 +1792,119 @@ msgstr "No es posible crear el analizador para %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "No se pudo abrir  %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Unidades"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr "Enviar inmersión(es) a divelogs.de"
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr "Enviar a divelogs.de"
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr "Enviar a divelogs.de ..."
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Hacer clic-derecho para marcar la ubicación con el cursor"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Identificador de usuario"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Manual de usuario"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Ver"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Visibilidad"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "O"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Aviso - Inmersiones extremadamente largas pueden provocar tiempos de cálculo muy largos"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Aviso - Planificar inmersiones muy profundas puede costar cantidades de tiempo excesivas"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Temp. de Agua"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Servicio web"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Mi"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Peso"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Sistema de lastre"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Peso:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML archivo"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Año"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Estadísticas anuales"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Ya tienes un ordenador de buceo de este modelo\n"
-"llamado %s\n"
-"Subsurface puede conservar otro nombre de este dispositivo para distinguirlo del que ya existe.  Por defecto sería el modelo y el identificador tal como se muestran abajo.Si no quieres poner nombre a este ordenador haz clic en \"Cancelar\" y Subsurface, simplemente, mostrará como nombre su modelo (lo que podría suponer que no pudieras distinguir entre los ordenadores en los diarios)."
+msgstr "Ya tienes un ordenador de buceo de este modelo\nllamado %s\nSubsurface puede conservar otro nombre de este dispositivo para distinguirlo del que ya existe.  Por defecto sería el modelo y el identificador tal como se muestran abajo.Si no quieres poner nombre a este ordenador haz clic en \"Cancelar\" y Subsurface, simplemente, mostrará como nombre su modelo (lo que podría suponer que no pudieras distinguir entre los ordenadores en los diarios)."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Has guardado los cambios \n"
-"¿Te gustaría guardar los cambios antes de cerrar el archivo de datos?"
+msgstr "Has guardado los cambios \n¿Te gustaría guardar los cambios antes de cerrar el archivo de datos?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Tienes cambios sin guardar en el archivo: %s \n"
-"¿Te gustaría guardar los cambios antes de cerrar el archivo de datos?"
+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:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "aire"
@@ -1775,7 +1913,11 @@ msgstr "aire"
 msgid "airtime"
 msgstr "tiempo de aire"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr "altura"
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "tobillo"
 
@@ -1783,21 +1925,33 @@ msgstr "tobillo"
 msgid "ascent"
 msgstr "ascenso"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "lastre en el arnes"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "cinturón"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr "barco"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
-msgstr "favorito"
+msgstr "marcador"
+
+#: statistics.c:21
+msgid "cave"
+msgstr "cueva"
+
+#: statistics.c:20
+msgid "cavern"
+msgstr "caverna"
 
 #: libdivecomputer.c:149
 msgid "ceiling"
@@ -1807,11 +1961,11 @@ msgstr "techo"
 msgid "ceiling (safety stop)"
 msgstr "techo (parada de seguridad)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "pie^3"
 
@@ -1823,6 +1977,10 @@ msgstr "datos"
 msgid "deco stop"
 msgstr "parada deco"
 
+#: statistics.c:20
+msgid "deep"
+msgstr "profunda"
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "parada de profundidad"
@@ -1839,40 +1997,48 @@ msgstr "identificador del punto de buceo"
 msgid "divetime"
 msgstr "duración de inmersión"
 
+#: statistics.c:20
+msgid "drift"
+msgstr "a la deriva"
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "traje seco"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "Todas las inmersiones"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "Inmersión #%d -"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "Inmersiones #"
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "inmersión seleccionada"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "inmersiones seleccionadas"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr "agua dulce"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "pies"
 
@@ -1888,10 +2054,18 @@ msgstr "cambio de mezcla"
 msgid "heading"
 msgstr "encabezado"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr "hielo"
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integrado"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr "no valida"
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "Número de evento inválido"
@@ -1900,15 +2074,19 @@ msgstr "Número de evento inválido"
 msgid "jacket"
 msgstr "chaleco"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr "lago"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "libra"
 
@@ -1916,15 +2094,15 @@ msgstr "libra"
 msgid "long john"
 msgstr "long john"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "max ppO2"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "maxCNS"
 
@@ -1936,7 +2114,7 @@ msgstr "Profundidad Max"
 msgid "membrane"
 msgstr "membrana"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1949,11 +2127,15 @@ msgstr "modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de serie=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "más datos para el identificador de  inmersión"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "más de %d días"
 
+#: statistics.c:22
+msgid "night"
+msgstr "noche"
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "tiempo sin parada"
@@ -1962,25 +2144,33 @@ msgstr "tiempo sin parada"
 msgid "none"
 msgstr "ninguno"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "umbral de pHe"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "umbral de pN%s"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "umbral de pO%s"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr "Foto"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "piscina"
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1992,6 +2182,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr "río"
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "parada de seguridad"
@@ -2008,6 +2202,10 @@ msgstr "parada de seguridad (voluntaria)"
 msgid "semidry"
 msgstr "semiseco"
 
+#: statistics.c:20
+msgid "shore"
+msgstr "orilla"
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "shorty"
@@ -2016,31 +2214,34 @@ msgstr "shorty"
 msgid "surface"
 msgstr "superficie"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr "enseñanza"
+
 #: libdivecomputer.c:154
 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:1075
+#: statistics.c:22
+msgid "training"
+msgstr "entrenamiento"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
-msgstr ""
-"José Ángel Tortosa Delfa\n"
-"Pablo García Castro\n"
-"Matthias Kaehlcke\n"
-"Sergio Schvezov\n"
-"Auni Somero\n"
-"Henrik Brautaset Aronsen (who doesn't speak Spanish)\n"
-"and Salvador Cuñat"
+msgstr "José Ángel Tortosa Delfa\nPablo García Castro\nMatthias Kaehlcke\nSergio Schvezov\nAuni Somero\nHenrik Brautaset Aronsen (who doesn't speak Spanish)\nand Salvador Cuñat"
 
 #: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "transmisor"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "desc"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "desconocido"
 
@@ -2052,11 +2253,15 @@ msgstr "no especificado"
 msgid "vest"
 msgstr "chaleco"
 
+#: statistics.c:23
+msgid "video"
+msgstr "video"
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "violación"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "peso"
 
@@ -2068,63 +2273,6 @@ msgstr "traje húmedo"
 msgid "workload"
 msgstr "carga"
 
-#~ msgid "About"
-#~ msgstr "Acerca de"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Automáticamente agrupar las inmersiones en viajes"
-
-#~ msgid "Delete"
-#~ msgstr "Eliminar"
-
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Profundidad\n"
-#~ "Promedio"
-
-#~ msgid "Dive details"
-#~ msgstr "Detalles de la inmersión"
-
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Duración\n"
-#~ "Total"
-
-#~ msgid "Pretty print"
-#~ msgstr "Impresión gráfica"
-
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "SAC\n"
-#~ "Promedio"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "SAC|\n"
-#~ "Mínimo"
-
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Temperature\n"
-#~ "Promedio"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP archivo"
-
-#~ msgid "deco"
-#~ msgstr "deco"
+#: statistics.c:21
+msgid "wreck"
+msgstr "pecio"
diff --git a/po/et_EE.aliases b/po/et_EE.aliases
new file mode 100644
index 000000000..2f4fffffd
--- /dev/null
+++ b/po/et_EE.aliases
@@ -0,0 +1 @@
+ee
diff --git a/po/et_EE.po b/po/et_EE.po
new file mode 100644
index 000000000..0c3f107bd
--- /dev/null
+++ b/po/et_EE.po
@@ -0,0 +1,2277 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aret Leetsaar <aret.leetsaar@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: subsurface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/subsurface/language/et_EE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et_EE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gtk-gui.c:1190
+msgid ""
+"\n"
+"No Events\n"
+msgstr ""
+
+#: statistics-gtk.c:94
+msgctxt "Stats"
+msgid " > Month"
+msgstr "Kuu"
+
+#: webservice.c:289
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:374
+msgid " Please select dive computer and device. "
+msgstr ""
+
+#: profile.c:429
+msgctxt "Starts with space!"
+msgid " begin"
+msgstr "algus"
+
+#: profile.c:430
+msgctxt "Starts with space!"
+msgid " end"
+msgstr "lõpp"
+
+#: statistics-gtk.c:92
+msgid "#"
+msgstr ""
+
+#: print.c:267 print.c:326
+#, c-format
+msgid "%.*f %s"
+msgstr ""
+
+#: print.c:344
+#, c-format
+msgid "%.*f %s\n"
+msgstr ""
+
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
+#, c-format
+msgid "%.*f %s/min"
+msgstr ""
+
+#: planner.c:581
+#, c-format
+msgid "%.0f%s of %s\n"
+msgstr ""
+
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
+#: print.c:88
+#, c-format
+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:566
+#, 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:569
+#, 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-gtk.c:349
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr ""
+
+#: print.c:582 statistics-gtk.c:356
+#, c-format
+msgid "%d min"
+msgstr "%d min"
+
+#: statistics.c:204
+#, c-format
+msgid "%dd %dh %dmin"
+msgstr ""
+
+#: statistics.c:206
+#, c-format
+msgid "%dh %dmin"
+msgstr "%dt %dmin"
+
+#: print.c:322
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2191
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2159
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2175
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2178
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2215
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2184
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr "%s⏎ Decos"
+
+#: profile.c:2208
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2187
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2149
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2167
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2170
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: planner.c:501
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2154
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2203
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr "%s⏎ pHe:%.2fbar"
+
+#: profile.c:2199
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr "%s⏎ pN%s:%.2fbar"
+
+#: profile.c:2195
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr "%s⏎ pO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
+#, c-format
+msgid "(%s) or (%s)"
+msgstr "(%s) või (%s)"
+
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr ""
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr ""
+
+#: statistics.c:265
+#, c-format
+msgid "(no dives)"
+msgstr "(pole sukeldumisi)"
+
+#: gtk-gui.c:2392
+msgid "(nothing)"
+msgstr "(tühi)"
+
+#: planner-gtk.c:389
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner-gtk.c:388
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: planner-gtk.c:394
+msgid "17 l/min"
+msgstr ""
+
+#: print.c:956
+msgid "2 dives per page"
+msgstr "2 sukeldumist lehel"
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner-gtk.c:393
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:999
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:952
+msgid "6 dives per page"
+msgstr "6 sukeldumist lehel"
+
+#: planner-gtk.c:336
+msgid ""
+"<small>Add segments below.\n"
+"Each line describes part of the planned dive.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
+"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
+msgstr ""
+
+#: planner-gtk.c:262
+msgid "AIR"
+msgstr "ÕHK"
+
+#: gtk-gui.c:1284 gtk-gui.c:1641
+msgid "About Subsurface"
+msgstr ""
+
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
+msgid "Add Dive..."
+msgstr "Lisa Sukeldumine..."
+
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
+msgid "Add dive"
+msgstr "Lisa Sukeldumine"
+
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
+msgid "Add to trip above"
+msgstr ""
+
+#: planner-gtk.c:413
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics-gtk.c:608
+msgid "Air Press"
+msgstr ""
+
+#: statistics-gtk.c:607
+msgid "Air Temp"
+msgstr ""
+
+#: info-gtk.c:596
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:390
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:77
+msgid "Apr"
+msgstr ""
+
+#: main.c:78
+msgid "Aug"
+msgstr ""
+
+#: gtk-gui.c:1655
+msgid "Autogroup"
+msgstr ""
+
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
+msgctxt "Depth"
+msgid "Average"
+msgstr "Keskmine"
+
+#: statistics-gtk.c:97
+msgctxt "Duration"
+msgid "Average"
+msgstr "Keskmine"
+
+#: statistics-gtk.c:103
+msgctxt "SAC"
+msgid "Average"
+msgstr "Keskmine"
+
+#: statistics-gtk.c:106
+msgctxt "Temp"
+msgid "Average"
+msgstr "Keskmine"
+
+#: statistics-gtk.c:562 statistics-gtk.c:599
+msgid "Avg Depth"
+msgstr ""
+
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:570
+msgid "Avg SAC"
+msgstr ""
+
+#: statistics-gtk.c:545
+msgid "Avg Temp"
+msgstr ""
+
+#: statistics-gtk.c:552
+msgid "Avg Time"
+msgstr ""
+
+#: profile.c:426
+#, c-format
+msgid "Bailing out to OC"
+msgstr ""
+
+#: gtk-gui.c:790
+msgid "Bar"
+msgstr "Bar"
+
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
+msgid "Buddy"
+msgstr "Semu"
+
+#: planner-gtk.c:291
+msgid "CC SetPoint"
+msgstr ""
+
+#: planner.c:123
+#, c-format
+msgid "Can't find gas %d/%d"
+msgstr ""
+
+#: parse-xml.c:1953
+#, c-format
+msgid "Can't open stylesheet (%s)/%s"
+msgstr ""
+
+#: uemis-downloader.c:932
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:757
+msgid "Cancelled..."
+msgstr ""
+
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:800
+msgid "Celsius"
+msgstr ""
+
+#: gtk-gui.c:686
+msgid "Choose Default XML File"
+msgstr ""
+
+#: gtk-gui.c:2294
+msgid "Choose XML Files To Import Into Current Data File"
+msgstr ""
+
+#: gtk-gui.c:1622
+msgid "Close"
+msgstr ""
+
+#: divelist-gtk.c:1815
+msgid "Collapse all"
+msgstr ""
+
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
+msgid "Connecting..."
+msgstr "Ühendab..."
+
+#: webservice.c:25
+msgid "Connection Error: "
+msgstr "Viga ühendamisel:"
+
+#: divelist-gtk.c:1787
+msgid "Create new trip above"
+msgstr ""
+
+#: gtk-gui.c:796
+msgid "CuFt"
+msgstr ""
+
+#: divelist-gtk.c:824 gtk-gui.c:820
+msgid "Cyl"
+msgstr ""
+
+#: equipment.c:982 equipment.c:1093 print.c:201
+msgid "Cylinder"
+msgstr "Balloon"
+
+#: planner.c:184
+msgid "Cylinder for planning"
+msgstr "Balloon planeerimiseks"
+
+#: equipment.c:1603
+msgid "Cylinders"
+msgstr "Balloonid"
+
+#: profile.c:2145
+#, c-format
+msgid "D:%.1f %s"
+msgstr ""
+
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
+msgstr "TÄHELEPANU: SIIN ON KASUTUSEL BUHLMANNI ALGORITMIL PÕHINEV SUKELDUMISTE PLANEERIJA, MIS ON NULLIST IMPLEMENTEERITUD JA SEDA ON HETKEL NAPILT KATSETATUD. SOOVITAME TUNGIVALT, MITTE PLANEERIDA OMA SUKELDUMIST AINULT SIIT SAADUD ANDMETE PÕHJAL."
+
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
+msgid "Date"
+msgstr "Kuupäev"
+
+#: info-gtk.c:821
+msgid "Date and Time"
+msgstr "Kuupäev ja aeg"
+
+#: info-gtk.c:831
+msgid "Date:"
+msgstr "Kuupäev:"
+
+#: main.c:78
+msgid "Dec"
+msgstr ""
+
+#: gtk-gui.c:862
+msgid "Default XML Data File"
+msgstr ""
+
+#: gtk-gui.c:1569
+msgid "Delete a dive computer information entry"
+msgstr ""
+
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
+msgid "Delete dive"
+msgstr "Kustuta sukeldumine"
+
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
+msgid "Delete dives"
+msgstr ""
+
+#: print.c:502 statistics-gtk.c:92
+msgid "Depth"
+msgstr "Sügavus"
+
+#: uemis.c:222
+msgid "Depth Limit Exceeded"
+msgstr "Sügavus limiit ületatud"
+
+#: gtk-gui.c:784
+msgid "Depth:"
+msgstr "Sügavus:"
+
+#: gtk-gui.c:1528
+msgid "Device Id"
+msgstr "Seadme ID"
+
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#. <trailing text>
+#: info.c:88
+#, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr ""
+
+#: info.c:130 print.c:83
+#, c-format
+msgid "Dive #%d - "
+msgstr ""
+
+#: libdivecomputer.c:436
+#, c-format
+msgid "Dive %d: %s %d %04d"
+msgstr ""
+
+#: gtk-gui.c:2374
+msgid "Dive Computer Nickname"
+msgstr ""
+
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
+msgid "Dive Info"
+msgstr ""
+
+#: gtk-gui.c:1872
+msgid "Dive Notes"
+msgstr ""
+
+#: planner-gtk.c:360
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
+msgid "Dive Time"
+msgstr ""
+
+#: uemis.c:228
+msgid "Dive Time Alert"
+msgstr ""
+
+#: uemis.c:226
+msgid "Dive Time Info"
+msgstr ""
+
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
+
+#: libdivecomputer.c:681
+msgid "Dive data import error"
+msgstr ""
+
+#: gps.c:214
+msgid "Dive locations"
+msgstr ""
+
+#: info-gtk.c:581
+msgid "Dive master"
+msgstr "Dive master"
+
+#: planner-gtk.c:382
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:502
+msgid "Dive#"
+msgstr ""
+
+#: gtk-gui.c:845
+msgid "Divelist Font"
+msgstr ""
+
+#: info-gtk.c:1001
+msgid "Divemaster"
+msgstr ""
+
+#: statistics-gtk.c:542
+msgid "Dives"
+msgstr ""
+
+#: gtk-gui.c:1636
+msgid "Dives Locations"
+msgstr ""
+
+#: download-dialog.c:365
+msgid "Download From Dive Computer"
+msgstr "Lae kompuutrist alla"
+
+#: gtk-gui.c:1629
+msgid "Download From Dive Computer..."
+msgstr ""
+
+#: webservice.c:260
+msgid "Download From Web Service"
+msgstr ""
+
+#: gtk-gui.c:1630
+msgid "Download From Web Service..."
+msgstr ""
+
+#: webservice.c:31
+msgid "Download Success!"
+msgstr ""
+
+#: print.c:502 statistics-gtk.c:92
+msgid "Duration"
+msgstr "Kestus"
+
+#: info-gtk.c:908
+msgid "Duration (min)"
+msgstr "Kestus (min)"
+
+#: info.c:312
+msgid "E"
+msgstr ""
+
+#: planner.c:88
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner-gtk.c:263
+msgid "EAN32"
+msgstr ""
+
+#: planner-gtk.c:264
+msgid "EAN36"
+msgstr ""
+
+#: info-gtk.c:99
+msgid "Edit"
+msgstr ""
+
+#: gtk-gui.c:1647
+msgid "Edit Device Names"
+msgstr "Muuda seadmete nime"
+
+#: gtk-gui.c:1501
+msgid "Edit Dive Computer Nicknames"
+msgstr "Muuda kompuutri hüüdnime"
+
+#: info-gtk.c:663
+msgid "Edit Trip Info"
+msgstr "Muuda Tripi Infot"
+
+#: divelist-gtk.c:1680
+msgid "Edit Trip Summary"
+msgstr "Muuda Tripi Kokkuvõtet"
+
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist-gtk.c:1650
+msgid "Edit dive"
+msgstr "Muuda sukeldumist"
+
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
+msgid "Edit dive date/time"
+msgstr "Muuda kuupäeva/aega"
+
+#: divelist-gtk.c:1649
+msgid "Edit dives"
+msgstr "Muuda sukeldumisi"
+
+#: info-gtk.c:539
+msgid "Edit multiple dives"
+msgstr ""
+
+#: info-gtk.c:369
+msgid "Edit trip summary"
+msgstr "Muuda tripi kokkuvõtet"
+
+#: gtk-gui.c:1183
+msgid "Enable / Disable Events"
+msgstr ""
+
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
+msgid "End"
+msgstr "Lõpp"
+
+#: planner-gtk.c:288
+msgid "Ending Depth"
+msgstr ""
+
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
+msgstr ""
+
+#: gtk-gui.c:1876 info-gtk.c:648
+msgid "Equipment"
+msgstr "Varustus"
+
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
+#: libdivecomputer.c:471
+msgid "Error obtaining water salinity"
+msgstr ""
+
+#: libdivecomputer.c:419
+msgid "Error parsing the datetime"
+msgstr ""
+
+#: libdivecomputer.c:441
+msgid "Error parsing the divetime"
+msgstr ""
+
+#: libdivecomputer.c:480
+msgid "Error parsing the gas mix"
+msgstr ""
+
+#: libdivecomputer.c:461
+msgid "Error parsing the gas mix count"
+msgstr ""
+
+#: libdivecomputer.c:451
+msgid "Error parsing the maxdepth"
+msgstr ""
+
+#: libdivecomputer.c:488
+msgid "Error parsing the samples"
+msgstr ""
+
+#: libdivecomputer.c:677
+msgid "Error registering the cancellation handler."
+msgstr ""
+
+#: libdivecomputer.c:410
+msgid "Error registering the data"
+msgstr ""
+
+#: libdivecomputer.c:672
+msgid "Error registering the event handler."
+msgstr ""
+
+#: libdivecomputer.c:645
+#, c-format
+msgid "Event: systime=%<PRId64>, devtime=%u\n"
+msgstr ""
+
+#: libdivecomputer.c:622
+msgid "Event: waiting for user action"
+msgstr ""
+
+#: divelist-gtk.c:1811
+msgid "Expand all"
+msgstr ""
+
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
+msgid "Fahrenheit"
+msgstr ""
+
+#: gtk-gui.c:124
+#, c-format
+msgid "Failed to open %i files."
+msgstr ""
+
+#: parse-xml.c:1599
+#, c-format
+msgid "Failed to parse '%s'"
+msgstr ""
+
+#: parse-xml.c:1598
+#, c-format
+msgid "Failed to parse '%s'.\n"
+msgstr ""
+
+#: file.c:282
+#, c-format
+msgid "Failed to read '%s'"
+msgstr ""
+
+#: file.c:278
+#, c-format
+msgid "Failed to read '%s'.\n"
+msgstr ""
+
+#: main.c:77
+msgid "Feb"
+msgstr ""
+
+#: gtk-gui.c:786
+msgid "Feet"
+msgstr "Jalg"
+
+#: gtk-gui.c:1612
+msgid "File"
+msgstr ""
+
+#: gtk-gui.c:1615
+msgid "Filter"
+msgstr "Filter"
+
+#: download-dialog.c:384
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:68
+msgid "Fri"
+msgstr ""
+
+#: gtk-gui.c:1017
+msgid "GFhigh"
+msgstr ""
+
+#: planner-gtk.c:405
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:1007
+msgid "GFlow"
+msgstr ""
+
+#: planner-gtk.c:404
+msgid "GFlow for plan"
+msgstr ""
+
+#: info-gtk.c:559
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#. ++GETTEXT Gas Used is amount used
+#: print.c:203
+msgid "Gas Used"
+msgstr ""
+
+#: statistics-gtk.c:617
+msgctxt "Amount"
+msgid "Gas Used"
+msgstr ""
+
+#: planner-gtk.c:290
+msgctxt "Type of"
+msgid "Gas Used"
+msgstr ""
+
+#: planner.c:570
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:1023 print.c:201
+msgid "Gasmix"
+msgstr ""
+
+#: gtk-gui.c:777
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1617
+msgid "Help"
+msgstr ""
+
+#: webservice.c:296
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
+
+#: divelist-gtk.c:1378 gtk-gui.c:1645
+msgid "Info"
+msgstr ""
+
+#: uemis-downloader.c:769
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1650
+msgid "Input Plan"
+msgstr ""
+
+#: planner-gtk.c:145
+#, c-format
+msgid "Invalid depth - could not parse \"%s\""
+msgstr ""
+
+#: planner-gtk.c:147
+msgid "Invalid depth - values deeper than 400m not supported"
+msgstr ""
+
+#: planner-gtk.c:118
+#, c-format
+msgid "Invalid gas for row %d"
+msgstr ""
+
+#: planner-gtk.c:207
+msgid "Invalid starttime"
+msgstr ""
+
+#: webservice.c:27
+msgid "Invalid user identifier!"
+msgstr ""
+
+#. ++GETTEXT: these are three letter months - we allow up to six code bytes
+#: main.c:77
+msgid "Jan"
+msgstr ""
+
+#: main.c:78
+msgid "Jul"
+msgstr ""
+
+#: main.c:77
+msgid "Jun"
+msgstr ""
+
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
+msgstr ""
+
+#: gtk-gui.c:1643
+msgid "List"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Liter"
+msgstr ""
+
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
+msgid "Location"
+msgstr ""
+
+#: gtk-gui.c:1613
+msgid "Log"
+msgstr ""
+
+#: statistics-gtk.c:99
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+
+#: statistics-gtk.c:553
+msgid "Longest Dive"
+msgstr ""
+
+#: uemis.c:236
+msgid "Low Battery Alert"
+msgstr ""
+
+#: uemis.c:234
+msgid "Low Battery Warning"
+msgstr ""
+
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr ""
+
+#: main.c:77
+msgid "Mar"
+msgstr ""
+
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
+msgid "Mark location here"
+msgstr ""
+
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
+#: uemis.c:230
+msgid "Marker"
+msgstr ""
+
+#: print.c:502
+msgid "Master"
+msgstr ""
+
+#: uemis.c:224
+msgid "Max Deco Time Warning"
+msgstr ""
+
+#: statistics-gtk.c:560 statistics-gtk.c:598
+msgid "Max Depth"
+msgstr ""
+
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:568
+msgid "Max SAC"
+msgstr ""
+
+#: statistics-gtk.c:543
+msgid "Max Temp"
+msgstr ""
+
+#: print.c:109
+#, c-format
+msgid ""
+"Max depth: %.*f %s\n"
+"Duration: %d min\n"
+"%s"
+msgstr ""
+
+#: print.c:377
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1518
+msgid "MaxPress"
+msgstr ""
+
+#: statistics-gtk.c:102
+msgctxt "Depth"
+msgid "Maximum"
+msgstr ""
+
+#: statistics-gtk.c:105
+msgctxt "SAC"
+msgid "Maximum"
+msgstr ""
+
+#: statistics-gtk.c:108
+msgctxt "Temp"
+msgid "Maximum"
+msgstr ""
+
+#: main.c:77
+msgid "May"
+msgstr ""
+
+#: divelist-gtk.c:1641
+msgid "Merge dives"
+msgstr ""
+
+#: divelist-gtk.c:1688
+msgid "Merge trip with trip above"
+msgstr ""
+
+#: divelist-gtk.c:1698
+msgid "Merge trip with trip below"
+msgstr ""
+
+#: gtk-gui.c:785
+msgid "Meter"
+msgstr ""
+
+#: statistics-gtk.c:561
+msgid "Min Depth"
+msgstr ""
+
+#: statistics-gtk.c:569
+msgid "Min SAC"
+msgstr ""
+
+#: statistics-gtk.c:544
+msgid "Min Temp"
+msgstr ""
+
+#: statistics-gtk.c:101
+msgctxt "Depth"
+msgid "Minimum"
+msgstr ""
+
+#: statistics-gtk.c:104
+msgctxt "SAC"
+msgid "Minimum"
+msgstr ""
+
+#: statistics-gtk.c:107
+msgctxt "Temp"
+msgid "Minimum"
+msgstr ""
+
+#: gtk-gui.c:851
+msgid "Misc. Options"
+msgstr ""
+
+#: gtk-gui.c:1523
+msgid "Model"
+msgstr ""
+
+#: main.c:68
+msgid "Mon"
+msgstr ""
+
+#: gtk-gui.c:1286
+msgid "Multi-platform divelog software in C"
+msgstr ""
+
+#: info.c:311
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1618
+msgid "New"
+msgstr ""
+
+#: gtk-gui.c:1238
+msgid "New starting number"
+msgstr ""
+
+#: gtk-gui.c:1649
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1533 gtk-gui.c:2396
+msgid "Nickname"
+msgstr ""
+
+#: uemis.c:232
+msgid "No Tank Data"
+msgstr ""
+
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
+msgid "Notes"
+msgstr ""
+
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
+msgid "Nov"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "OLF"
+msgstr ""
+
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
+#, c-format
+msgid "OTU"
+msgstr ""
+
+#: main.c:78
+msgid "Oct"
+msgstr ""
+
+#: libdivecomputer.c:770
+msgid "Odd pthread error return"
+msgstr ""
+
+#: gtk-gui.c:1580
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
+msgid "Open File"
+msgstr ""
+
+#: gtk-gui.c:1619
+msgid "Open..."
+msgstr ""
+
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:173
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "PO2"
+msgstr ""
+
+#: uemis.c:210
+msgid "PO2 Ascend Alarm"
+msgstr ""
+
+#: uemis.c:208
+msgid "PO2 Ascend Warning"
+msgstr ""
+
+#: uemis.c:205
+msgid "PO2 Green Warning"
+msgstr ""
+
+#: gtk-gui.c:791
+msgid "PSI"
+msgstr ""
+
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1616
+msgid "Planner"
+msgstr ""
+
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
+msgid "Preferences"
+msgstr ""
+
+#: gtk-gui.c:1632
+msgid "Preferences..."
+msgstr ""
+
+#: equipment.c:1002 equipment.c:1008
+msgid "Pressure"
+msgstr ""
+
+#: gtk-gui.c:789
+msgid "Pressure:"
+msgstr ""
+
+#: gtk-gui.c:1648
+msgid "Prev DC"
+msgstr ""
+
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
+msgid "Print only selected dives"
+msgstr ""
+
+#: print.c:974
+msgid "Print selection"
+msgstr ""
+
+#: print.c:939 print.c:946
+msgid "Print type"
+msgstr ""
+
+#: gtk-gui.c:1623
+msgid "Print..."
+msgstr ""
+
+#: gtk-gui.c:1644
+msgid "Profile"
+msgstr ""
+
+#: gtk-gui.c:898
+msgid "Profile Settings"
+msgstr ""
+
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
+msgid "Quit"
+msgstr ""
+
+#: uemis.c:218
+msgid "RGT Alert"
+msgstr ""
+
+#: uemis.c:216
+msgid "RGT Warning"
+msgstr ""
+
+#: info-gtk.c:587 info-gtk.c:1007
+msgid "Rating"
+msgstr ""
+
+#: uemis-downloader.c:364
+#, c-format
+msgid "Reading %s %s"
+msgstr ""
+
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
+msgid "Remove Trip"
+msgstr ""
+
+#: divelist-gtk.c:1805
+msgid "Remove dive from trip"
+msgstr ""
+
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
+msgid "Remove selected dives from trip"
+msgstr ""
+
+#: gtk-gui.c:1229
+msgid "Renumber"
+msgstr ""
+
+#: gtk-gui.c:1633
+msgid "Renumber..."
+msgstr ""
+
+#: download-dialog.c:141
+msgid "Retry"
+msgstr ""
+
+#: info.c:311
+msgid "S"
+msgstr ""
+
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
+#, c-format
+msgid "SAC"
+msgstr ""
+
+#: planner-gtk.c:399
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner-gtk.c:398
+msgid "SAC during dive"
+msgstr ""
+
+#: uemis.c:198
+msgid "Safety Stop Violation"
+msgstr ""
+
+#: main.c:68
+msgid "Sat"
+msgstr ""
+
+#: gtk-gui.c:1621
+msgid "Save As..."
+msgstr ""
+
+#: gtk-gui.c:227
+msgid "Save Changes?"
+msgstr ""
+
+#: divelist-gtk.c:1028 gtk-gui.c:164
+msgid "Save File As"
+msgstr ""
+
+#: divelist-gtk.c:1720
+msgid "Save as"
+msgstr ""
+
+#: gtk-gui.c:1620
+msgid "Save..."
+msgstr ""
+
+#: planner-gtk.c:289
+msgid "Segment Time"
+msgstr ""
+
+#: gtk-gui.c:1174
+msgid "Select Events"
+msgstr ""
+
+#: gtk-gui.c:1638
+msgid "Select Events..."
+msgstr ""
+
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
+msgid "Sep"
+msgstr ""
+
+#: uemis-downloader.c:30
+msgid ""
+"Short write to req.txt file\n"
+"Is the Uemis Zurich plugged in correctly?"
+msgstr ""
+
+#: statistics-gtk.c:98
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+
+#: statistics-gtk.c:554
+msgid "Shortest Dive"
+msgstr ""
+
+#: gtk-gui.c:809 gtk-gui.c:882
+msgid "Show Columns"
+msgstr ""
+
+#: gtk-gui.c:978
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:961
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:994
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:986
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist-gtk.c:1776
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:944
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:925
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:906
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:209
+msgid "Simulated Dive"
+msgstr ""
+
+#: equipment.c:999 equipment.c:1517
+msgid "Size"
+msgstr ""
+
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
+#: uemis.c:200
+msgid "Speed Alarm"
+msgstr ""
+
+#: uemis.c:203
+msgid "Speed Warning"
+msgstr ""
+
+#: equipment.c:1010 equipment.c:1519
+msgid "Start"
+msgstr ""
+
+#: uemis-downloader.c:782
+msgid "Start download"
+msgstr ""
+
+#: statistics-gtk.c:532
+msgid "Statistics"
+msgstr ""
+
+#: statistics-gtk.c:468
+#, c-format
+msgid "Statistics %s"
+msgstr ""
+
+#: gtk-gui.c:1884
+msgid "Stats"
+msgstr ""
+
+#: webservice.c:295
+msgid "Status"
+msgstr ""
+
+#: planner.c:551
+#, c-format
+msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
+#: parse-xml.c:443
+#, c-format
+msgid "Strange percentage reading %s\n"
+msgstr ""
+
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
+msgid "Suit"
+msgstr ""
+
+#. ++GETTEXT: these are three letter days - we allow up to six code bytes
+#: main.c:68
+msgid "Sun"
+msgstr ""
+
+#: statistics-gtk.c:592
+msgid "Surf Intv"
+msgstr ""
+
+#: planner-gtk.c:383
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:562
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:960
+msgid "Table print"
+msgstr ""
+
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
+#: uemis.c:220
+msgid "Tank Change Suggested"
+msgstr ""
+
+#: uemis.c:214
+msgid "Tank Pressure Info"
+msgstr ""
+
+#: gtk-gui.c:880
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:815
+msgid "Temp"
+msgstr ""
+
+#: statistics-gtk.c:92
+msgid "Temperature"
+msgstr ""
+
+#: gtk-gui.c:799
+msgid "Temperature:"
+msgstr ""
+
+#: gtk-gui.c:1646
+msgid "Three"
+msgstr ""
+
+#: main.c:68
+msgid "Thu"
+msgstr ""
+
+#: info-gtk.c:838
+msgid "Time"
+msgstr ""
+
+#: gtk-gui.c:1768
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1656
+msgid "Toggle Zoom"
+msgstr ""
+
+#: planner.c:286
+msgid "Too many gas mixes"
+msgstr ""
+
+#: planner-gtk.c:317
+msgid "Too many waypoints"
+msgstr ""
+
+#: statistics-gtk.c:96
+msgctxt "Duration"
+msgid "Total"
+msgstr ""
+
+#: statistics-gtk.c:551
+msgid "Total Time"
+msgstr ""
+
+#: print.c:340
+#, c-format
+msgid "Total Weight:"
+msgstr ""
+
+#: planner.c:542
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:583
+#, 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)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main.c:68
+msgid "Tue"
+msgstr ""
+
+#: equipment.c:1516 equipment.c:1544
+msgid "Type"
+msgstr ""
+
+#: uemis-downloader.c:28
+msgid ""
+"Uemis Zurich: File System is almost full\n"
+"Disconnect/reconnect the dive computer\n"
+"and click 'Retry'"
+msgstr ""
+
+#: uemis-downloader.c:29
+msgid ""
+"Uemis Zurich: File System is full\n"
+"Disconnect/reconnect the dive computer\n"
+"and try again"
+msgstr ""
+
+#: uemis-downloader.c:771
+msgid "Uemis init failed"
+msgstr ""
+
+#: libdivecomputer.c:699
+msgid "Unable to create libdivecomputer context"
+msgstr ""
+
+#: libdivecomputer.c:404
+#, c-format
+msgid "Unable to create parser for %s %s"
+msgstr ""
+
+#: libdivecomputer.c:701
+#, c-format
+msgid "Unable to open %s %s (%s)"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Units"
+msgstr ""
+
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
+msgid "Use right click to mark dive location at cursor"
+msgstr ""
+
+#: webservice.c:282 webservice.c:333
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1642
+msgid "User Manual"
+msgstr ""
+
+#: gtk-gui.c:1614
+msgid "View"
+msgstr ""
+
+#: info-gtk.c:593 statistics-gtk.c:600
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:794
+msgid "Volume:"
+msgstr ""
+
+#: info.c:312
+msgid "W"
+msgstr ""
+
+#: planner-gtk.c:162
+msgid "Warning - extremely long dives can cause long calculation time"
+msgstr ""
+
+#: planner-gtk.c:137
+msgid "Warning - planning very deep dives can take excessive amounts of time"
+msgstr ""
+
+#: statistics-gtk.c:606
+msgid "Water Temp"
+msgstr ""
+
+#: webservice.c:163
+msgid "Webservice"
+msgstr ""
+
+#: main.c:68
+msgid "Wed"
+msgstr ""
+
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
+msgid "Weight"
+msgstr ""
+
+#: equipment.c:1148 print.c:308
+#, c-format
+msgid "Weight System"
+msgstr ""
+
+#: gtk-gui.c:804
+msgid "Weight:"
+msgstr ""
+
+#: gtk-gui.c:152
+msgid "XML file"
+msgstr ""
+
+#: statistics-gtk.c:92
+msgid "Year"
+msgstr ""
+
+#: gtk-gui.c:1634 statistics-gtk.c:295
+msgid "Yearly Statistics"
+msgstr ""
+
+#: gtk-gui.c:2382
+#, c-format
+msgid ""
+"You already have a dive computer of this model\n"
+"named %s\n"
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
+msgstr ""
+
+#: gtk-gui.c:237
+msgid ""
+"You have unsaved changes\n"
+"Would you like to save those before closing the datafile?"
+msgstr ""
+
+#: gtk-gui.c:240 gtk-gui.c:243
+#, c-format
+msgid ""
+"You have unsaved changes to file: %s \n"
+"Would you like to save those before closing the datafile?"
+msgstr ""
+
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
+#, c-format
+msgid "air"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "airtime"
+msgstr ""
+
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
+msgid "ankle"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "ascent"
+msgstr ""
+
+#: equipment.c:893
+msgid "backplate weight"
+msgstr ""
+
+#: dive.c:48
+msgid "bar"
+msgstr ""
+
+#: equipment.c:891
+msgid "belt"
+msgstr ""
+
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
+msgid "bookmark"
+msgstr ""
+
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "ceiling"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "ceiling (safety stop)"
+msgstr ""
+
+#: equipment.c:894
+msgid "clip-on"
+msgstr ""
+
+#: dive.c:93 planner.c:951
+msgid "cuft"
+msgstr ""
+
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "deco stop"
+msgstr ""
+
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "deepstop"
+msgstr ""
+
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "divetime"
+msgstr ""
+
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:780
+msgid "ean"
+msgstr ""
+
+#: statistics.c:263
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:259
+#, c-format
+msgid "for dive #%d"
+msgstr ""
+
+#: statistics.c:217
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:261
+#, c-format
+msgid "for selected dive"
+msgstr ""
+
+#: statistics.c:224
+#, c-format
+msgid "for selected dives"
+msgstr ""
+
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
+msgid "ft"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
+msgid "gaschange"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "heading"
+msgstr ""
+
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
+msgid "integrated"
+msgstr ""
+
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
+#: libdivecomputer.c:171
+msgid "invalid event number"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
+msgid "kg"
+msgstr ""
+
+#: dive.c:88
+msgid "l"
+msgstr ""
+
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
+msgid "lbs"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
+msgid "m"
+msgstr ""
+
+#: gtk-gui.c:966
+msgid "max ppO2"
+msgstr ""
+
+#: divelist-gtk.c:828 gtk-gui.c:893
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "maxdepth"
+msgstr ""
+
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist-gtk.c:820 planner.c:957
+msgid "min"
+msgstr ""
+
+#: libdivecomputer.c:630
+#, c-format
+msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
+msgstr ""
+
+#: uemis-downloader.c:409
+msgid "more data dive id"
+msgstr ""
+
+#: statistics.c:198
+#, c-format
+msgid "more than %d days"
+msgstr ""
+
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "none"
+msgstr ""
+
+#: gtk-gui.c:949
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:931
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:912
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:44
+msgid "pascal"
+msgstr ""
+
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
+msgid "psi"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "rbt"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "rgbm"
+msgstr ""
+
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "safety stop"
+msgstr ""
+
+#: libdivecomputer.c:151
+msgid "safety stop (mandatory)"
+msgstr ""
+
+#: libdivecomputer.c:151
+msgid "safety stop (voluntary)"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "surface"
+msgstr ""
+
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
+#: libdivecomputer.c:154
+msgid "tissue level warning"
+msgstr ""
+
+#: statistics.c:22
+msgid "training"
+msgstr ""
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
+msgid "translator-credits"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "transmitter"
+msgstr ""
+
+#: equipment.c:1409 equipment.c:1429
+msgid "unkn"
+msgstr ""
+
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
+msgid "unknown"
+msgstr ""
+
+#: equipment.c:540
+msgid "unspecified"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "violation"
+msgstr ""
+
+#: equipment.c:1545
+msgid "weight"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "workload"
+msgstr ""
+
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 4569a95d1..976f31dde 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,39 +1,37 @@
-# Finnish translations for Subsurface package
-# Finnish messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# based on the Swedigh translations by
-# Linus Torvalds <torvalds@linux-foundation.org>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Linus Torvalds <torvalds@linux-foundation.org>, 2012
+# mturkia <miika.turkia@gmail.com>, 2013
+# mturkia <miika.turkia@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-26 06:11+0200\n"
-"Last-Translator: Miika Turkia <miika.turkia@gmail.com>\n"
-"Language-Team: Finnish\n"
-"Language: fi_FI\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/subsurface/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Basepath: ..\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Ei tapahtumia\n"
+msgstr "\nEi tapahtumia\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Kuukausi"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr "Lataa"
 
@@ -41,17 +39,17 @@ msgstr "Lataa"
 msgid " Please select dive computer and device. "
 msgstr "Valitse sukellustietokone ja laitenimi."
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr "alku"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr "loppu"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "#"
 
@@ -65,52 +63,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f %s (%s)\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%d pv %d t %d min"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%d t %d min"
@@ -120,185 +119,167 @@ msgstr "%d t %d min"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS: %u %%"
+msgstr "%s\nCNS: %u %%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Laskettu katto %.0f %s"
+msgstr "%s\nLaskettu katto %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko: %u min @ %.0f %s"
+msgstr "%s\nDeko: %u min @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko: tuntem. aika @ %.0f %s"
+msgstr "%s\nDeko: tuntem. aika @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD: %d %s\n"
-"END: %d %s\n"
-"EADD: %d %s"
+msgstr "%s\nEAD: %d %s\nEND: %d %s\nEADD: %d %s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"dekossa"
+msgstr "%s\ndekossa"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD: %d %s"
+msgstr "%s\nMOD: %d %s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL: %u min"
+msgstr "%s\nNDL: %u min"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P: %d %s"
+msgstr "%s\nP: %d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Turvapysähdys: %u min @ %.0f %s"
+msgstr "%s\nTurvapysähdys: %u min @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Turvapysähdys: tuntemat. aika @ %.0f %s"
+msgstr "%s\nTurvapysähdys: tuntemat. aika @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurfacen laskema sukellussuunnitelma\n"
-"perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurfacen laskema sukellussuunnitelma\nperustuu arvoihin GFlow = %.0f ja GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T: %.1f %s"
+msgstr "%s\nT: %.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe: %.2f bar"
+msgstr "%s\npHe: %.2f bar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s: %.2f bar"
+msgstr "%s\npN%s: %.2f bar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s: %.2f bar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr "%s tapahtuma %d:%02u"
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
 msgstr ""
-"%s\n"
-"pO%s: %.2f bar"
 
-#: dive.c:918
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) tai (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(valitse muokataksesi ajankohtaa)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(valitse muokataksesi ajankohtaa tai syvyyttä)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(ei sukelluksia)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(ei mitään)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 cft³/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 ft³/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "Kaksi sukellusta sivulle"
 
@@ -306,66 +287,78 @@ msgstr "Kaksi sukellusta sivulle"
 msgid "2 pcs full suit"
 msgstr "Kaksiosainen kokopuku"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "Kolmen metrin portaat laskennalliselle kattosyvyydelle"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "Kuusi sukellusta sivulle"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
-msgstr ""
-"<small>Syötä suunnitellun sukelluksen vaiheet alla olevaan listaan.\n"
-"Kukin rivi kuvaa yhtä sukelluksen vaihetta, joka päättyy annettuun syvyyteen ja aikaan sekä käyttää annettua kaasua. Aika voidaan määritellä joko suhteellisena edellisen vaiheen päättymisestä (+3:30) tai absoluuttisena sukelluksen alusta (3:30).\n"
-"Jos vaiheen kaasua ei ole määritelty, vaiheessa käytetään edellisen vaiheen kaasua. Suunnitelman alussa oletetaan käytettäväksi ilmaa ellei kaasua ole määritelty lainkaan.\n"
-"Voit määritellä nousun automaattiselle suunnittelulle kaasun, joka otetaan käyttöön tietyllä syvyydellä. Jätä tällöin vaiheen kesto tyhjäksi ja syötä syvyys ja kaasu normaalisti.\n"
-"Saraketta CC käytetään ainoastaan suljetun kierron sukelluslaitteiden kanssa. Jos käytät avoimen kierron laitteita, jätä sarake tyhjäksi.</small>\n"
+msgstr "<small>Syötä suunnitellun sukelluksen vaiheet alla olevaan listaan.\nKukin rivi kuvaa yhtä sukelluksen vaihetta, joka päättyy annettuun syvyyteen ja aikaan sekä käyttää annettua kaasua. Aika voidaan määritellä joko suhteellisena edellisen vaiheen päättymisestä (+3:30) tai absoluuttisena sukelluksen alusta (@3:30).\nJos vaiheen kaasua ei ole määritelty, vaiheessa käytetään edellisen vaiheen kaasua. Suunnitelman alussa oletetaan käytettäväksi ilmaa ellei kaasua ole määritelty lainkaan.\nVoit määritellä nousua varten kaasun, joka otetaan käyttöön automaattisesti tietyssä syvyydessä. Jätä tällöin vaiheen kesto tyhjäksi ja syötä syvyys ja kaasu normaalisti.\nSaraketta CC käytetään ainoastaan suljetun kierron sukelluslaitteiden kanssa. Jos käytät avoimen kierron laitteita, jätä sarake tyhjäksi.</small>\n"
 
-#: planner.c:1198
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "Ilma"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "Tietoja Subsurfacesta"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr "Lisää"
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Lisää sukellus..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr "Lisää kirjanmerkki"
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Lisää sukellus"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr "Lisää kaasun vaihto"
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr "Lisää kaasun vaihto ajalle %d:%02u"
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Liitä yllä olevaan retkeen"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Lisää uusi jakso"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Ilmanpaine"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Ilman lämpötila"
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Ilman lämpötila (%s)"
@@ -374,77 +367,86 @@ msgstr "Ilman lämpötila (%s)"
 msgid "Always prefer downloaded dive"
 msgstr "Suosi aina ladattua sukellusta"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "huhti"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "elo"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Automaattinen ryhmittely"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr "Mahdolliset kaasut"
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Keskim."
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Keskim."
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Keskim."
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Keskim."
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Keskisyvyys"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Keskisyvyys (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Pintakulutus"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Keskilämpötila"
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Keskipituus"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Vaihto avoimeen ilman kiertoon"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Sukelluspari"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CCR-asetuspiste"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Seosta %d/%d ei löydy"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Konversiotiedoston avaus epäonnistui (%s)/%s"
@@ -457,121 +459,143 @@ msgstr "Peruutettu, poistutaan..."
 msgid "Cancelled..."
 msgstr "Peruttu..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr "Kaasun muutosta ei voida lisätä"
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Vastauksen jäsentäminen ei onnistu!"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Valitse oletustiedosto"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Valitse tietoihin liitettävät XML-tiedostot"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Sulje"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Supista kaikki retket"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Yhteysvirhe:"
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Liitä uuteen retkeen"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "kuutiojalka"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Säiliöt"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Säiliö"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Suunnitelman säiliö"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Säiliöt"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "S:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "VAROITUS: BUHLMANNIN ALGORITMIN TOTEUTUS JA SIIHEN PERUSTUVA SUKELLUSTEN SUUNNITTELUOMINAISUUS OVAT UUSIA, JOTEN NIITÄ ON TESTATTU VAIN RAJALLISESTI. SUKELLUKSIA SUUNNITELTAESSA EI TULE LUOTTAA VAIN NÄIHIN TULOKSIIN."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr "Tietokantayhteys epäonnistui '%s'.\n"
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr "Tietokantakysely epäonnistui '%s'.\n"
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr "Tietokantakysely 'get_events' (nouda tapahtumat) epäonnistui.\n"
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Ajankohta"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Päivä ja aika"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Päivä:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "joulu"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Oletustiedosto"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Poista sukellustietokoneen tiedot"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Poista sukellus"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Poista sukellukset"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Syvyys"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Syvyys (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Syvyysraja ylitetty"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Syvyys:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Laitenimi"
 
@@ -579,13 +603,18 @@ msgstr "Laitenimi"
 msgid "Device or mount point"
 msgstr "Laite- tai hakemistopolku"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr "Näytä epäkelvot sukellukset"
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Sukellus #%1$d - %2$s %4$d.%3$d.%5$04d, %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Sukellus #%1$d - %2$s %4$02d.%3$02d.%5$04d, %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Sukellus #%d - "
@@ -595,23 +624,27 @@ msgstr "Sukellus #%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Sukellus %1$d: %3$d. %2$skuuta %4$04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Sukellustietokoneen lempinimi"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Tiedot"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Muistiinpanot"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Sukelluksen suunnittelu - TÄMÄ ON SIMULAATIO; ÄLÄ KÄYTÄ SUKELLUKSEEN"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr "Sukellustyypit"
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Sukellusaika"
 
@@ -631,15 +664,15 @@ msgstr "Sukellustietokoneen valmistaja ja laite"
 msgid "Dive data import error"
 msgstr "Virhe sukellusten jäsentämisessä"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Sukelluskohde"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Sukellusvanhin"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Aloitusaika"
 
@@ -647,19 +680,19 @@ msgstr "Aloitusaika"
 msgid "Dive#"
 msgstr "Sukellus"
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Sukelluslistan kirjasin"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Sukellusvanhin"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Sukelluskerrat"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Sukelluskohteet"
 
@@ -667,111 +700,123 @@ msgstr "Sukelluskohteet"
 msgid "Download From Dive Computer"
 msgstr "Hae sukellustietokoneelta"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Hae sukellustietokoneelta..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Hae verkkopalvelusta"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Hae verkkopalvelusta..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Lataus onnistui!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Kesto"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Kesto (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "E"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Muuta"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Muokkaa laitenimeä"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Muokkaa sukellustietokoneiden lempinimiä"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Muuta retken tietoja"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Muuta retken tietoja"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Muokkaa sukellustietokoneen lempinimeä kaksoisnäpäyttämällä muokattavaa kenttää"
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Muuta sukelluksen tietoja"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Muuta sukelluksen ajankohtaa"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Muuta sukellusten tietoja"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Muuta valittujen sukellusten tietoja"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Muuta retken tietoja"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Näytä / piilota tapahtumamerkit"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr "Näytä / piilota sukellustyypit"
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Loppu"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Kohdesyvyys"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Syötä käyttäjätunnus ja paina \"Lataa\"-painiketta. Kun tiedot on ladattu, voit painaa 'Hyväksy', jos haluat ottaa muutokset käyttöön."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Varusteet"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Virhe veden suolapitoisuuden määrityksessä"
@@ -821,52 +866,64 @@ msgstr "Tapahtuma: systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Tapahtuma: odotetaan käyttäjän toimia"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Laajenna kaikki retket"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr "Vienti UDDF-tiedostoon"
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr "Vie UDDF..."
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr "Vie sukellukset UDDF-tiedostoon"
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "%i tiedoston avaaminen epäonnistui."
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Tiedoston '%s' lukeminen epäonnistui."
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Tiedoston '%s' avaaminen epäonnistui"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "helmi"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "jalka"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Tiedosto"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Suodattimet"
 
@@ -874,27 +931,27 @@ msgstr "Suodattimet"
 msgid "Force download of all dives"
 msgstr "Lataa kaikki sukellukset"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "pe"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (WGS84- tai GPS-muodossa)"
 
@@ -903,42 +960,42 @@ msgstr "GPS (WGS84- tai GPS-muodossa)"
 msgid "Gas Used"
 msgstr "Kulutus"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Ilmankulutus"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Kaasu"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Kaasun kulutus:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Kaasuseos"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Yleisasetukset"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Ohje"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "Toimeton"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Liitä tiedot XML-tiedostosta..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr "Liitä tiedostot..."
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Tiedot"
 
@@ -946,71 +1003,75 @@ msgstr "Tiedot"
 msgid "Init Communication"
 msgstr "Muodosta yhteys"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Suunnittele"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Virheellinen syvyys - seuraavan syötteen tulkinta epäonnistui: %s"
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Virheellinen syvyys - yli neljänsadan metrin syvyisiä sukelluksia ei tueta"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Virheellinen kaasu rivillä %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Virhellinen aloitusaika"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Tuntematon käyttäjä!"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "tammi"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "heinä"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "kesä"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr "Sommittelun asetukset"
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel et al., 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Sukelluslista"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "litra"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Kohde"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Loki"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Pisin"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Pisin sukellus"
 
@@ -1022,14 +1083,26 @@ msgstr "Hälytys: heikko paristo"
 msgid "Low Battery Warning"
 msgstr "Varoitus: heikko paristo"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Karttapohja"
+
+#: main.c:77
 msgid "Mar"
 msgstr "maalis"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr "Merkitse epäkelvoksi"
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Valitse sijainti"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr "Merkitse kelpaavaksi"
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "merkki"
@@ -1042,15 +1115,20 @@ msgstr "Sukellusvanhin"
 msgid "Max Deco Time Warning"
 msgstr "Varoitus: etappipysähdysaika"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Suurin syvyys"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Suurin syvyys (%s):"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Suurin pintakulutus"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Ylin lämpötila"
 
@@ -1060,115 +1138,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Suurin syvyys: %.*f %s\n"
-"Kesto: %d min\n"
-"%s"
+msgstr "Suurin syvyys: %.*f %s\nKesto: %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Max. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Nimellispaine"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Suurin"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Suurin"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Korkein"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "touko"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Yhdistä sukellukset"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Liitä retki yllä olevaan retkeen"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Liitä retki alla olevaan retkeen"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "metri"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Pienin syvyys"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Pienin pintakulutus"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Alin lämpötila"
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Pienin"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Pienin"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Alin"
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Sekalaiset asetukset"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Malli"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "ma"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Usean laitealustan sukelluspäiväkirjaohjelma C-kielellä"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Uusi"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Uusi aloitusnumero"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Seuraava tietokone"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Lempinimi"
 
@@ -1176,11 +1251,24 @@ msgstr "Lempinimi"
 msgid "No Tank Data"
 msgstr "Ei tietoja säiliöistä"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr "Sukellukselle ei ole määritetty säiliötä"
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Muistiinpanot"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr "Muistiinpanojen korkeus (%d%% - %d%%)"
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr "Muistiinpanot yllä"
+
+#: main.c:78
 msgid "Nov"
 msgstr "marras"
 
@@ -1188,12 +1276,12 @@ msgstr "marras"
 msgid "OLF"
 msgstr "Happikertymä"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "Happikertymä"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "loka"
 
@@ -1201,18 +1289,31 @@ msgstr "loka"
 msgid "Odd pthread error return"
 msgstr "Outo pthread-virheen paluukoodi"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Poistetaanko valittu merkintä?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr "Näytä vain valituntyyppiset sukellukset:"
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Avaa..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr "Järjestys"
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr "Muiden tietojen korkeus (%d%% - %d%%)"
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1234,63 +1335,86 @@ msgstr "Varoitus: hapen osapaine"
 msgid "PO2 Green Warning"
 msgstr "Varoitus: hapen osapaine (green)"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "psi"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr "Salasana"
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Valitse kartalta"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Suunnittelu"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr "Syötä käyttäjätunnus ja salasana divelogs.de -sivustolle. Valitut sukellukset lisätään tunnuksellesi"
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Asetukset..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Paine"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Paine:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Edellinen tietokone"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr "Väritulostus"
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Tulosta valitut sukellukset"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Tulosteen valinta"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Tulosteen tyyppi"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profiilikuvaaja"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Profiiliasetukset"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr "Profiilin korkeus (%d%% - %d%%)"
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr "Profiili yllä"
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Lopeta"
 
@@ -1302,7 +1426,7 @@ msgstr "Hälytys: kaasumäärä"
 msgid "RGT Warning"
 msgstr "Varoitus: kaasumäärä"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Yleisarvio"
 
@@ -1311,23 +1435,31 @@ msgstr "Yleisarvio"
 msgid "Reading %s %s"
 msgstr "Luetaan sukellusta %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr "Poista"
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Poista retki"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Erota sukellus pois retkestä"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr "Lisää tapahtuma tähän"
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Erota valitut sukellukset pois retkestä"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Uudellennumeroi"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Uudellennumeroi..."
 
@@ -1335,20 +1467,21 @@ msgstr "Uudellennumeroi..."
 msgid "Retry"
 msgstr "Yritä uudestaan"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "Pintakulutus"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "Pintakulutus deko-pysähdyksessä"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "Pintakulutus sukelluksen aikana"
 
@@ -1356,43 +1489,47 @@ msgstr "Pintakulutus sukelluksen aikana"
 msgid "Safety Stop Violation"
 msgstr "Turvapysähdyksen laiminlyönti"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "la"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Tallenna muutokset?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Tallenna nimellä"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Tallenna nimellä..."
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Tallenna..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Aika"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Valitse tapahtumat"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Valitse tapahtumat..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr "Valitse sukellustyypit..."
+
+#: main.c:78
 msgid "Sep"
 msgstr "syys"
 
@@ -1400,65 +1537,68 @@ msgstr "syys"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Tiedoston req.txt kirjoittaminen epäonnistui.\n"
-"Onko Uemis Zurich kytketty oikein?"
+msgstr "Tiedoston req.txt kirjoittaminen epäonnistui.\nOnko Uemis Zurich kytketty oikein?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Lyhin"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Lyhin sukellus"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Näytä sarakkeet"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Näytä EAD, END sekä EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Näytä MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Näytä laskettu kattosyvyys"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Näytä sukellustietokoneen raportoima kattosyvyys punaisella"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Näytä kartalla"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Näytä pHe-kuvaaja"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Näytä pN%s-kuvaaja"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Näytä pO%s-kuvaaja"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Simuloitu sukellus"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Tilavuus"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Hälytys: nousunopeus"
@@ -1467,7 +1607,7 @@ msgstr "Hälytys: nousunopeus"
 msgid "Speed Warning"
 msgstr "Varoitus: nousunopeus"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Alku"
 
@@ -1475,59 +1615,63 @@ msgstr "Alku"
 msgid "Start download"
 msgstr "Aloita lataus"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Tilastot %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Tilastot"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Tila"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Outo prosenttiosuus: %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Puku"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "su"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Pinta-aika"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Ilmanpaine pinnalla (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Vaihda kaasu seuraavaan: %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Taulukkotuloste"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr "Sukellustyypit näytetään vain jos ne ovat identtiset kaikissa muokattavissa sukelluksissa"
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Säiliönvaihtoehdotus"
@@ -1536,60 +1680,58 @@ msgstr "Säiliönvaihtoehdotus"
 msgid "Tank Pressure Info"
 msgstr "Tiedotus: säiliöpaine"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Tekniikka-asetukset"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Lämpötila"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Lämpötila"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Lämpötila:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Kaikki"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "to"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Kello"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Avaa sukellustietojen muokkausikkuna\n"
-"kaksoisnäpäyttämällä sukellusta listalla"
+msgstr "Avaa sukellustietojen muokkausikkuna\nkaksoisnäpäyttämällä sukellusta listalla"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Venytä sukellusprofiilikuvaajaa"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Liian monta kaasuseosta"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Liikaa välietappeja"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Yhteensä"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Kokonaisaika"
 
@@ -1598,24 +1740,24 @@ msgstr "Kokonaisaika"
 msgid "Total Weight:"
 msgstr "Kokonaismassa:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Retki %1$s, %3$d. %2$skuuta %4$04d (%5$d sukellus)"
 msgstr[1] "Retki %1$s, %3$d. %2$skuuta %4$04d (%5$d sukellusta)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "ti"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -1624,20 +1766,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: tiedostojärjestelmä on lähes täynnä.\n"
-"Liitä sukellustietokone uudestaan\n"
-"ja yritä uudestaan."
+msgstr "Uemis Zurich: tiedostojärjestelmä on lähes täynnä.\nLiitä sukellustietokone uudestaan\nja yritä uudestaan."
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: Tiedostojärjestelmä on täynnä.\n"
-"Liitä sukellustietokone uudestaan\n"
-"ja yritä uudestaan."
+msgstr "Uemis Zurich: Tiedostojärjestelmä on täynnä.\nLiitä sukellustietokone uudestaan\nja yritä uudestaan."
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1657,115 +1793,119 @@ msgstr "Jäsentäjän luominen %s %s epäonnistui"
 msgid "Unable to open %s %s (%s)"
 msgstr "Avaaminen epäonnistui: %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Yksiköt"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr "Lähetä sukellukset divelogs.de -sivustolle"
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr "Lähetä divelogs.de -sivustolle"
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr "Lähetä divelogs.de -sivustolle..."
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Näpäytä oikealla painikkeella merkitäksesi kursorin osoittaman sukelluskohteen"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Käyttäjätunniste"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Käyttöohje"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Näytä"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Näkyvyys"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Tilavuus:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "W"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Varoitus - hyvin pitkien sukellusten suunnitelman laskeminen voi kestää kohtuuttoman kauan"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Varoitus: hyvin syvien sukellusten suunnittelu voi kestää kohtuuttoman kauan"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Veden lämpötila"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Verkkopalvelu"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "ke"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Painot"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Painot"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Massa:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML-tiedosto"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Vuosi"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Vuositilastot"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Sinulla on jo tämän mallinen sukellustietokone\n"
-"nimellä %s\n"
-"Voit halutessasi antaa laitteelle lempinimen. Lempinimen antaminen helpottaa sukellustietokoneen sekä sen lokien tunnistamisessa. Oletuksena laitteen nimenä käytetään sen mallia ja tunnistetta.\n"
-"Jos et halua antaa laitteelle lempinimeä, paina \"Peru\"-painiketta."
+msgstr "Sinulla on jo tämän mallinen sukellustietokone\nnimellä %s\nVoit halutessasi antaa laitteelle lempinimen. Lempinimen antaminen helpottaa sukellustietokoneen sekä sen lokien tunnistamisessa. Oletuksena laitteen nimenä käytetään sen mallia ja tunnistetta.\nJos et halua antaa laitteelle lempinimeä, paina \"Peru\"-painiketta."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Sinulla on tallentamattomia muutoksia.\n"
-"Haluatko tallentaa muutokset ennen tietojen sulkemista?"
+msgstr "Sinulla on tallentamattomia muutoksia.\nHaluatko tallentaa muutokset ennen tietojen sulkemista?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Tiedosto %s on muuttunut.\n"
-"Haluatko tallentaa muutokset ennen tietojen sulkemista?"
+msgstr "Tiedosto %s on muuttunut.\nHaluatko tallentaa muutokset ennen tietojen sulkemista?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "ilma"
@@ -1774,7 +1914,11 @@ msgstr "ilma"
 msgid "airtime"
 msgstr "Ilma-aika"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr "korkeus"
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "nilkkapaino"
 
@@ -1782,22 +1926,34 @@ msgstr "nilkkapaino"
 msgid "ascent"
 msgstr "nousu"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "selkäpaino"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "vyöpaino"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr "vene"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "kirjanmerkki"
 
+#: statistics.c:21
+msgid "cave"
+msgstr "luola"
+
+#: statistics.c:20
+msgid "cavern"
+msgstr "luola (cavern)"
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "katto"
@@ -1806,11 +1962,11 @@ msgstr "katto"
 msgid "ceiling (safety stop)"
 msgstr "katto (turvapysähdys)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "ft³"
 
@@ -1822,6 +1978,10 @@ msgstr "tieto"
 msgid "deco stop"
 msgstr "deko-pysähdys"
 
+#: statistics.c:20
+msgid "deep"
+msgstr "syvä"
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "syväpysähdys"
@@ -1838,40 +1998,48 @@ msgstr "id: lisää sijaintitietoa"
 msgid "divetime"
 msgstr "sukellusaika"
 
+#: statistics.c:20
+msgid "drift"
+msgstr "virta"
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "kuivapuku"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "kaikille sukelluksille"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "Sukellus #%d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "sukellukselle numero "
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "valittu sukellus"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "valitut sukellukset"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr "makea vesi"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1887,10 +2055,18 @@ msgstr "Kaasun vaihto"
 msgid "heading"
 msgstr "suunta"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr "jää"
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integroitu"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr "epäkelpo"
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "tuntematon tapahtumanumero"
@@ -1899,15 +2075,19 @@ msgstr "tuntematon tapahtumanumero"
 msgid "jacket"
 msgstr "takki"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr "järvi"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "pauna"
 
@@ -1915,15 +2095,15 @@ msgstr "pauna"
 msgid "long john"
 msgstr "haalari"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "max ppO2"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "maxCNS"
 
@@ -1935,7 +2115,7 @@ msgstr "Suurin syvyys"
 msgid "membrane"
 msgstr "laminaatti"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1948,11 +2128,15 @@ msgstr "malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "id: lisää sukellusdataa"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "yli %d päivää"
 
+#: statistics.c:22
+msgid "night"
+msgstr "yö"
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "keskeytyksetön aika"
@@ -1961,25 +2145,33 @@ msgstr "keskeytyksetön aika"
 msgid "none"
 msgstr "ei mitään"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "pHe-kynnys"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "pN%s-kynnys"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "pO%s-kynnys"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "Pa"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr "valokuva"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "uima-allas"
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1991,6 +2183,10 @@ msgstr "pohja-aika"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr "joki"
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "turvapysähdys"
@@ -2007,6 +2203,10 @@ msgstr "turvapysähdys (vapaaehtoinen)"
 msgid "semidry"
 msgstr "puolikuiva"
 
+#: statistics.c:20
+msgid "shore"
+msgstr "ranta"
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "lyhyt"
@@ -2015,26 +2215,34 @@ msgstr "lyhyt"
 msgid "surface"
 msgstr "pinta"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr "opetus"
+
 #: libdivecomputer.c:154
 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:1075
+#: statistics.c:22
+msgid "training"
+msgstr "harjoittelu"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
-msgstr ""
-"Tommi Saviranta\n"
-"Miika Turkia"
+msgstr "Tommi Saviranta\nMiika Turkia"
 
 #: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "lähetin"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "tuntematon"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "tuntematon"
 
@@ -2046,11 +2254,15 @@ msgstr "määrittelemätön"
 msgid "vest"
 msgstr "liivi"
 
+#: statistics.c:23
+msgid "video"
+msgstr "video"
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "rike"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "Massa"
 
@@ -2062,29 +2274,6 @@ msgstr "märkäpuku"
 msgid "workload"
 msgstr "työmäärä"
 
-#~ msgid "%1$s, %3$s.%2$d.%4$04d   %5$dh%6$02d"
-#~ msgstr "%1$s, %2$d. %3$skuuta %4$04d   %5$dh%6$02d"
-
-#~ msgid "1 dive per page"
-#~ msgstr "Yksi sukellus sivulle"
-
-#~ msgid "About"
-#~ msgstr "Tietoja"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Ryhmittele sukellukset retkiin automaattisesti"
-
-#~ msgid "Delete"
-#~ msgstr "Poista"
-
-#~ msgid "Dive details"
-#~ msgstr "Tiedot"
-
-#~ msgid "Pretty print"
-#~ msgstr "Hieno tuloste"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP-tiedosto"
-
-#~ msgid "deco"
-#~ msgstr "etappipysähdys"
+#: statistics.c:21
+msgid "wreck"
+msgstr "hylky"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index a58272095..1d4fdf061 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,40 +1,40 @@
-# French translations for Subsurface package
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-#
-# Pierre-Yves Chibon <pingou@pingoured.fr>, 2012, 2013
-# Jean-Noël Rouchon <jnoel@sissiou.net>, 2012
-# Stéphane Raimbault <stephane.raimbault@gmail.com>, 2012
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# dirkhh <dirk@hohndel.org>, 2013
+# jnoel <jnoel@sissiou.net>, 2012-2013
+# Bakurt <jimbakurt@gmail.com>, 2013
 # Kévin Raymond <shaiton@fedoraproject.org>, 2013
+# pingou <pingou@pingoured.fr>, 2012-2013
+# Stéphane Raimbault <stephane.raimbault@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-26 21:04+0100\n"
-"Last-Translator: Kévin Raymond <shaiton@fedoraproject.org>\n"
-"Language-Team: French\n"
-"Language: fr\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: French (France) (http://www.transifex.com/projects/p/subsurface/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"Language: fr_FR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Aucun événements\n"
+msgstr "\nAucun événement\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
-msgstr " > mois"
+msgstr " > Mois"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr " Télécharger"
 
@@ -42,17 +42,17 @@ msgstr " Télécharger"
 msgid " Please select dive computer and device. "
 msgstr "Veuillez choisir un ordinateur de plongée et son périphérique associé."
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr " début"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr " fin"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "N°"
 
@@ -66,52 +66,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s de %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%d j %d h %d min"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%d h %d min"
@@ -121,185 +122,167 @@ msgstr "%d h %d min"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"SNC : %u%%"
+msgstr "%s\nSNC : %u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Plafond calculé %.0f %s"
+msgstr "%s\nPlafond calculé %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Décompression : %umin @ %.0f %s"
+msgstr "%s\nDécompression : %umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Décompression : durée inconnue @ %.0f %s"
+msgstr "%s\nDécompression : durée inconnue @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD : %d%s\n"
-"END : %d%s\n"
-"EADD : %d%s"
+msgstr "%s\nEAD : %d%s\nEND : %d%s\nEADD : %d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"En décompression"
+msgstr "%s\nEn décompression"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD : %d%s"
+msgstr "%s\nMOD : %d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL : %umin"
+msgstr "%s\nNDL : %umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P : %d %s"
+msgstr "%s\nP : %d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Arrêt de sécurité : %umin @ %.0f %s"
+msgstr "%s\nArrêt de sécurité : %umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Arrêt de sécurité : durée inconnue @ %.0f %s"
+msgstr "%s\nArrêt de sécurité : durée inconnue @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface sumilation de plongée\n"
-"basé sur un GFlow = %.0f et un GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface sumilation de plongée\nbasé sur un GFlow = %.0f et un GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T : %.1f %s"
+msgstr "%s\nT : %.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe : %.2fbar"
+msgstr "%s\npHe : %.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s : %.2fbar"
+msgstr "%s\npN%s : %.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s : %.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
 msgstr ""
-"%s\n"
-"pO%s : %.2fbar"
 
-#: dive.c:918
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) ou (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(cliquer pour modifier la date et l'heure de la plongée)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(cliquer pour modifier la date, l'heure et la profondeur de la plongée)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(pas de plongées)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(rien)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.016 m³/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.02 m³/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 plongées par page"
 
@@ -307,67 +290,78 @@ msgstr "2 plongées par page"
 msgid "2 pcs full suit"
 msgstr "Combi 2 pièces"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "Pas de 3 m pour calculer le plafond"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 plongées par page"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
 msgstr ""
-"<small>Ajouter des sections ci-dessous.\n"
-"Chaque ligne décrit une partie de la plongée prévue.\n"
-"Une ligne comprend la profondeur, le temps et le gaz utilisé pendant la section qui se termine à la profondeur désignée, dure le temps prévu (si durée relative : « +3:30 ») ou finit au temps prévu (si la durée est absolue) et utilise la quantité de gaz indiquée.\n"
-"Si aucun gaz n'est précisé, cela correspondra à « utiliser le gaz précédant » (ou à AIR si aucun gaz n'a été spécifié).\n"
-"Un entrée avec une profondeur et un gaz mais sans durée est particulière ; elle informe le planificateur que le volume de gaz indiqué sera disponible pour la remonté une fois la profondeur indiquée atteinte.\n"
-"Les repères CF sont pour les plongées en CF (circuit-fermé, avec recycleur), laisser vide pour les plongées en CO (circuit ouvert).</small>\n"
-
-#: planner.c:1198
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "AIR"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "À propos de Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Ajouter une plongée..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Ajouter une plongée"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Ajouter au groupe au-dessus"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Ajouter des points de cheminement"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Pression athmosphérique"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Temp. atmosphérique"
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Temp. atmosphérique en %s"
@@ -376,77 +370,86 @@ msgstr "Temp. atmosphérique en %s"
 msgid "Always prefer downloaded dive"
 msgstr "Choisir les plongées téléchargées par défaut"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Avril"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Août"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Grouper automatiquement"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Moyenne"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Moyenne"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Moyenne"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Moyenne"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Profondeur moy."
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Profondeur moyenne (%s) :"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Consommation d'air moy."
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Temp. moy."
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Tps moy."
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Passer en CO"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Binôme"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "repère CF"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Impossible de trouver le gaz %d/%d"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Impossible d'ouvrir la feuille de style (%s)/%s"
@@ -459,121 +462,143 @@ msgstr "Annulé, sortie en cours..."
 msgid "Cancelled..."
 msgstr "Annulé..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Impossible de lire la réponse"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Choisissez le fichier XML par défaut"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Choisissez le fichier XML à importer dans les données actuelles"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Fermer"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Tout replier"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Connexion en cours..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Erreur de connexion : "
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Créer un nouveau groupe au-dessus"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "Pieds³"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Blk"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Bloc"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Bloc pour la simulation"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Blocs"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
-msgstr "P : %.1f %s/min"
+msgstr "P : %.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
-msgstr "ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L'ALGORITHME DE BUHLMANN ET LE SIMULATEUR DE PLONGÉE N'A ÉTÉ TESTÉ QUE SOMMAIREMENT. IL EST FORTEMENT CONSEILLÉ DE NE PAS PLONGER EN SE BASANT UNIQUEMENT PAR LES INDICATIONS FOURNIES ICI."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
+msgstr "ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L'ALGORITHME DE BUHLMANN ET LE SIMULATEUR DE PLONGÉE N'A ÉTÉ TESTÉ QUE SOMMAIREMENT. IL EST FORTEMENT CONSEILLÉ DE NE PAS PLONGER EN SE BASANT UNIQUEMENT SUR LES INDICATIONS FOURNIES ICI."
+
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Date"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Date :"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Déc."
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Fichier XML par défaut"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Supprimer un ordinateur de plongée"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Supprimer la plongée"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Supprimer les plongées"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Profondeur"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Profondeur (%s) :"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Profondeur plafond dépassée"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Profondeur :"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Nom du périphérique"
 
@@ -581,13 +606,18 @@ msgstr "Nom du périphérique"
 msgid "Device or mount point"
 msgstr "Périphérique ou point de montage"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Plongée n°%1$d - %2$s %4$02d/%3$02d/%5$04d à %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Plongée n°%1$d - %2$s %4$02d/%3$02d/%5$04d à %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Plongée n°%d - "
@@ -597,23 +627,27 @@ msgstr "Plongée n°%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Plongée n°%d - %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Surnom de l'ordinateur de plongée"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Détails de plongée"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Notes de plongée"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Planificateur de plongée - CECI EST UNE SIMULATION ; NE PAS L'UTILISER POUR PLONGER"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Temps de plongée"
 
@@ -633,15 +667,15 @@ msgstr "Marque et modèle de l'ordinateur de plongée"
 msgid "Dive data import error"
 msgstr "Erreur à l'import des données de plongées"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Lieux"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Chef de palanquée"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Début de la plongée ?"
 
@@ -649,19 +683,19 @@ msgstr "Début de la plongée ?"
 msgid "Dive#"
 msgstr "Plongée n°"
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Police pour la liste de plongée"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Chef de palanquée"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Plongées"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Lieux"
 
@@ -669,111 +703,123 @@ msgstr "Lieux"
 msgid "Download From Dive Computer"
 msgstr "Télécharger depuis l'ordinateur de plongée"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Télécharger depuis l'ordinateur de plongée..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Télécharger depuis le serveur"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Télécharger depuis le serveur..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Téléchargement réussi"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Durée"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Durée (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "E"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "Nitrox%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "Nitrox32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "Nitrox36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Modifier"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Modifier le nom du périphérique"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Modifier le surnom de l'ordinateur de plongée"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Modifier les informations du groupe"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Modifier le résumé du groupe"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Modifier le surnom de l'ordinateur de plongée en faisant un double-clic sur le champ du surnom."
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Modifier la plongée"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Modifier la date et l'heure de la plongée"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Modifier les plongées"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Modifier plusieurs plongées"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Modifier le résumé du groupe"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
-msgstr "Activer/désactiver événements"
+msgstr "Activer/désactiver des événements"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Fin"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Profondeur finale"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
-msgstr "Entrer l'identifiant de l'utilisateur et appuyer sur « Télécharger ». Une fois le téléchargement complet vous pouvez appuyer sur « Appliquer » si vous voulez appliquer  les modifications."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
+msgstr "Entrer l'identifiant de l'utilisateur et appuyer sur « Télécharger ». Une fois le téléchargement complet vous pouvez appuyer sur « Appliquer » si vous voulez appliquer les modifications."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Équipement"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr "Erreur"
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Impossible d'obtenir la salinité de l'eau"
@@ -808,7 +854,7 @@ msgstr "Impossible d'enregistrer le gestionnaire d'annulation."
 
 #: libdivecomputer.c:410
 msgid "Error registering the data"
-msgstr "Impossible d'enregistrer de la date"
+msgstr "Impossible d'enregistrer les données"
 
 #: libdivecomputer.c:672
 msgid "Error registering the event handler."
@@ -823,52 +869,64 @@ msgstr "Événement : systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Événement : attente d'une action de l'utilisateur"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Tout déplier"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
-msgstr "Impossible de l'ouverture du fichier %i."
+msgstr "Impossible d'ouvrir %i fichiers."
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Impossible d'analyser « %s »"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Impossible d'analyser « %s ».\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Impossible de la lecture « %s »"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Impossible de lire « %s ».\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Fév."
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Pieds"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Fichier"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filtrer"
 
@@ -876,27 +934,27 @@ msgstr "Filtrer"
 msgid "Force download of all dives"
 msgstr "Forcer le téléchargement de toutes les plongées"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Ven."
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhaut"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhaut pour la simulation"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFbas"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFbas pour la simulation"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (format WGS84 ou GPS)"
 
@@ -905,42 +963,42 @@ msgstr "GPS (format WGS84 ou GPS)"
 msgid "Gas Used"
 msgstr "Air utilisé"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Gaz utilisé"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Gaz utilisé"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Consommation de gaz :\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Mélange gazeux"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Préférences générales"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Aide"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "Inactif"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Importer les fichiers XML..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Informations"
 
@@ -948,71 +1006,75 @@ msgstr "Informations"
 msgid "Init Communication"
 msgstr "Initialisation de la communication"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Saisir le plan"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Profondeur invalide \"%s\""
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
-msgstr "Profondeur invalid - profondeurs inférieures à 400m ne sont pas supportés"
+msgstr "Profondeur invalide - les profondeurs inférieures à 400m ne sont pas supportées"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Gaz invalide ligne %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Heure de début invalide"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Identifiant utilisateur incorrect."
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Janv."
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Juil."
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Juin"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel et autres, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Litre"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Lieu"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Journal"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Plus longue"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Plongée la plus longue"
 
@@ -1024,13 +1086,25 @@ msgstr "Alarme de batterie faible"
 msgid "Low Battery Warning"
 msgstr "Avertissement de batterie faible"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Logiciel de cartographie"
+
+#: main.c:77
 msgid "Mar"
 msgstr "Mar."
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
 msgid "Mark location here"
-msgstr "Sélectioner l'emplacement"
+msgstr "Sélectionner l'emplacement"
+
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
 
 #: uemis.c:230
 msgid "Marker"
@@ -1044,15 +1118,20 @@ msgstr "Chef"
 msgid "Max Deco Time Warning"
 msgstr "Avertissement de temps de décompression max"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Profondeur max."
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Profondeur maximale (%s) :"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Consommation d'air max."
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Temp. max."
 
@@ -1062,115 +1141,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Profondeur max. : %.*f %s\n"
-"Durée : %d min\n"
-"%s"
+msgstr "Profondeur max. : %.*f %s\nDurée : %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "SNC Max."
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "PressionMax"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Mai"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Fusionner les plongées"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Fusionner le groupe avec le groupe au dessus"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
-msgstr "Fusionner le groupe avec le groupe au dessous"
+msgstr "Fusionner le groupe avec le groupe en dessous"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Mètre"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Profondeur min."
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Consommation d'air min."
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Temp. min."
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Options diverses"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Modèle"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Lun."
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Journal de plongée multi systèmes, écrit en C"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Nouveau"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Nouveau numéro de départ"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Ordinateur suivant"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Surnom"
 
@@ -1178,11 +1254,24 @@ msgstr "Surnom"
 msgid "No Tank Data"
 msgstr "Pas d'information sur le bloc"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Notes"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
 msgstr "Nov."
 
@@ -1190,12 +1279,12 @@ msgstr "Nov."
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Oct."
 
@@ -1203,18 +1292,31 @@ msgstr "Oct."
 msgid "Odd pthread error return"
 msgstr "Étrange erreur pthread retournée"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Supprimer cette entrée ?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
 msgid "Open File"
-msgstr "Ouvrir Fichier"
+msgstr "Ouvrir un Fichier"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Ouvrir..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1236,63 +1338,86 @@ msgstr "Avertissement PO2 ascendant"
 msgid "PO2 Green Warning"
 msgstr "Avertissement PO2 Vert"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "PSI"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
 msgid "Pick on map"
-msgstr "Sélectioner sur une carte"
+msgstr "Sélectionner sur une carte"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Simulateur"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Préférences"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Préférences..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Pression"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Pression :"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Ordinateur précédent"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Imprimer uniquement les plongées selectionnées"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Imprimer la sélection"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Type d'impression"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Préférences personnelles"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Quitter"
 
@@ -1304,7 +1429,7 @@ msgstr "Alerte temps air restant"
 msgid "RGT Warning"
 msgstr "Avertissement temps d'air restant"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Évaluation"
 
@@ -1313,23 +1438,31 @@ msgstr "Évaluation"
 msgid "Reading %s %s"
 msgstr "Lecture %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Supprimer groupe"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Retirer la plongée du groupe"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Retirer les plongées sélectionnées du groupe"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Renuméroter"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Renuméroter..."
 
@@ -1337,20 +1470,21 @@ msgstr "Renuméroter..."
 msgid "Retry"
 msgstr "Essayer à nouveau"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "Consommation d'air"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "Consommation d'air pendant la décompression"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "Consommation d'air pendant la plongée"
 
@@ -1358,44 +1492,47 @@ msgstr "Consommation d'air pendant la plongée"
 msgid "Safety Stop Violation"
 msgstr "Violation du palier de sécurité"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Sam."
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-# Title
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Enregistrement des changements ?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Enregistrer le fichier sous"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Enregistrer..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Fragmenter le temps"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Sélection des événements"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Sélection des événements..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
 msgid "Sep"
 msgstr "Sept."
 
@@ -1403,74 +1540,77 @@ msgstr "Sept."
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Écriture partielle des progrès dans le fichier req.txt\n"
-"Est-ce que votre Uemis Zurich est branché correctement ?"
+msgstr "Écriture partielle des progrès dans le fichier req.txt\nEst-ce que votre Uemis Zurich est branché correctement ?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Plus courte"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Plongée la plus courte"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Afficher les colonnes"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Afficher EAD, END, EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Afficher MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Afficher le plafond calculé"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Afficher en rouge le plafond signalé par l'ordinateur"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Afficher sur une carte"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Afficher le graph pHe"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Afficher le graph pN%s"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Afficher le graph pO%s"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Plongée simulée"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Taille"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarme de vitesse"
 
 #: uemis.c:203
 msgid "Speed Warning"
-msgstr "Avertissemnt de vitesse"
+msgstr "Avertissement de vitesse"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Début"
 
@@ -1478,59 +1618,63 @@ msgstr "Début"
 msgid "Start download"
 msgstr "Début du téléchargement"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Statistiques %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Stats"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Statut"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Valeur de pourcentage étrange %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Combinaison"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "Dim."
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Tps entre plongées"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Pression en surface (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Changer pour du gaz %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Impression du tableau"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Changement de bloc suggéré"
@@ -1539,60 +1683,58 @@ msgstr "Changement de bloc suggéré"
 msgid "Tank Pressure Info"
 msgstr "Pression du bloc"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Préférences techniques"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temp."
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Température"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Température :"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Trois"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Jeu."
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Temps"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Pour modifier les information d'une plongée\n"
-"faites un double-clic sur la plongée dans la liste"
+msgstr "Pour modifier les informations d'une plongée\nfaites un double-clic sur la plongée dans la liste"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Changer de zoom"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Trop de gaz différents"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
-msgstr "Trops de points de cheminement"
+msgstr "Trop de points de cheminement"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Temps total"
 
@@ -1601,24 +1743,24 @@ msgstr "Temps total"
 msgid "Total Weight:"
 msgstr "Poids total :"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Groupe %1$s %3$d %2$s %4$d (%5$d plongée)"
 msgstr[1] "Groupe %1$s %3$d %2$s %4$d (%5$d plongées)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Mar."
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Type"
 
@@ -1627,20 +1769,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich : le disque dur est presque plein\n"
-"Débranchez puis rebranchez l'ordinateur\n"
-"afin d'essayer à nouveau"
+msgstr "Uemis Zurich : le disque dur est presque plein\nDébranchez puis rebranchez l'ordinateur\nafin d'essayer à nouveau"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich : Le disque dur est plein\n"
-"Débranchez puis rebranchez l'ordinateur\n"
-"afin d'essayer à nouveau"
+msgstr "Uemis Zurich : Le disque dur est plein\nDébranchez puis rebranchez l'ordinateur\nafin d'essayer à nouveau"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1648,7 +1784,7 @@ msgstr "Impossible d'initialiser Uemis"
 
 #: libdivecomputer.c:699
 msgid "Unable to create libdivecomputer context"
-msgstr "Impossible de créer un context libdivecomputer"
+msgstr "Impossible de créer un contexte libdivecomputer"
 
 #: libdivecomputer.c:404
 #, c-format
@@ -1660,115 +1796,119 @@ msgstr "Impossible de créer une analyse pour %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Impossible d'ouvrir %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Unités"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
-msgstr "Faites un clic droit pour marquer la position de la plongé au curseur"
+msgstr "Faites un clic droit pour marquer la position de la plongée au curseur"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Identifiant utilisateur"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Manuel utilisateur"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Vue"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Volume :"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "O"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
-msgstr "Attention - les longues plongées entrainent de long temps de calcul"
+msgstr "Attention - les très longues plongées entraînent de long temps de calcul"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Attention - la simulation de plongées très profondes peut durer un certain temps"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Temp. de l'eau"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Serveur"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Mer."
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Poids"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Système de poids"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Poids:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "Fichier XML"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Année"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Statistiques annuelles"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Vous avez déjà un ordinateur de ce modèle\n"
-"nommé %s\n"
-"Subsurface peut donner un surnom à ce modèle pour le distinguer du précédant.Le modèle et l'identifiant du périphérique sont montré ci-dessous.\n"
-"Si vous ne voulez pas donner un surnom à ce modèle, appuyez sur « Annuler » et Subsurface utilisera son modèle (ce qui peut signifier que vous ne pourrez distinguer les deux ordinateurs)."
+msgstr "Vous avez déjà un ordinateur de ce modèle\nnommé %s\nSubsurface peut donner un surnom à ce modèle pour le distinguer du précédant.Le modèle et l'identifiant du périphérique sont montré ci-dessous.\nSi vous ne voulez pas donner un surnom à ce modèle, appuyez sur « Annuler » et Subsurface utilisera son modèle (ce qui peut signifier que vous ne pourrez distinguer les deux ordinateurs)."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Vous avez des changements non enregistrés.\n"
-"Souhaitez-vous enregistrer ces changements avant de fermer ?"
+msgstr "Vous avez des changements non enregistrés.\nSouhaitez-vous enregistrer ces changements avant de fermer ?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Vous avez des changements non enregistrés dans le fichier : %s \n"
-"Souhaitez-vous enregistrer ces changements avant de le fermer ?"
+msgstr "Vous avez des changements non enregistrés dans le fichier : %s \nSouhaitez-vous enregistrer ces changements avant de le fermer ?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "air"
@@ -1777,7 +1917,11 @@ msgstr "air"
 msgid "airtime"
 msgstr "temps d'air"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "cheville"
 
@@ -1785,22 +1929,34 @@ msgstr "cheville"
 msgid "ascent"
 msgstr "ascension"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "poids dorsaux"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "ceinture"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "marque-page"
 
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "plafond"
@@ -1809,11 +1965,11 @@ msgstr "plafond"
 msgid "ceiling (safety stop)"
 msgstr "plafond (palier de sécurité)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "pied³"
 
@@ -1821,11 +1977,14 @@ msgstr "pied³"
 msgid "data"
 msgstr "données"
 
-# voir pallier ?
 #: libdivecomputer.c:149
 msgid "deco stop"
 msgstr "Arrêt de décompression"
 
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "Arrêt profond"
@@ -1842,40 +2001,48 @@ msgstr "identifiant du site de plongée"
 msgid "divetime"
 msgstr "Temps de plongée"
 
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "Combinaison sèche"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "pour toutes les plongées"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "pour la plongée n°%d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "pour les plongées n°"
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
-msgstr "uniquement la plongée selectionnée"
+msgstr "uniquement la plongée sélectionnée"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
-msgstr "uniquement les plongées selectionnées"
+msgstr "uniquement les plongées sélectionnées"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "pied"
 
@@ -1891,10 +2058,18 @@ msgstr "Changement de gas"
 msgid "heading"
 msgstr "entête"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "intégré"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "numéro d'événement non valide"
@@ -1903,43 +2078,47 @@ msgstr "numéro d'événement non valide"
 msgid "jacket"
 msgstr "gilet"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "livre US"
 
 #: uemis-downloader.c:590
 msgid "long john"
-msgstr "salopette combinaison"
+msgstr "salopette de combinaison"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "ppO2 max"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "SNCmax"
 
 #: libdivecomputer.c:153
 msgid "maxdepth"
-msgstr "prof. max"
+msgstr "profondeur max"
 
 #: uemis-downloader.c:591
 msgid "membrane"
 msgstr "membrane"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1952,11 +2131,15 @@ msgstr "modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0
 msgid "more data dive id"
 msgstr "plus d'identifiants de plongée"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "plus de %d jours"
 
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "temps sans arrêt"
@@ -1965,25 +2148,33 @@ msgstr "temps sans arrêt"
 msgid "none"
 msgstr "aucun"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "limite pHe"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "limite pN%s"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "limite pO%s"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1995,6 +2186,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "palier de sécurité"
@@ -2011,6 +2206,10 @@ msgstr "palier de sécurité (volontaire)"
 msgid "semidry"
 msgstr "semi-étanche"
 
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "shorty"
@@ -2019,44 +2218,54 @@ msgstr "shorty"
 msgid "surface"
 msgstr "surface"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
 #: libdivecomputer.c:154
 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:1075
-msgid "translator-credits"
+#: statistics.c:22
+msgid "training"
 msgstr ""
-"Pierre-Yves Chibon\n"
-"Jean-Noël Rouchon\n"
-"Stéphane Raimbault\n"
-"Kévin Raymond"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
+msgid "translator-credits"
+msgstr "Pierre-Yves Chibon\nJean-Noël Rouchon\nStéphane Raimbault\nKévin Raymond\nSylvestre Ledru"
 
 #: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "transmetteur"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "inconnu"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "inconnu"
 
 #: equipment.c:540
 msgid "unspecified"
-msgstr "non specifié"
+msgstr "non spécifié"
 
 #: uemis-downloader.c:590
 msgid "vest"
 msgstr "veste"
 
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "violation"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "poids"
 
@@ -2068,17 +2277,6 @@ msgstr "combinaison humide"
 msgid "workload"
 msgstr "charge"
 
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Grouper automatiquement les plongées"
-
-#~ msgid "Dive details"
-#~ msgstr "Détails de la plongée"
-
-#~ msgid "Pretty print"
-#~ msgstr "Impression mise en forme"
-
-#~ msgid "ZIP file"
-#~ msgstr "Fichier ZIP"
-
-#~ msgid "deco"
-#~ msgstr "décompression"
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/hr_HR.po.disabled b/po/hr_HR.po
index 6b8bfe66f..b0de12fc3 100644
--- a/po/hr_HR.po.disabled
+++ b/po/hr_HR.po
@@ -1,144 +1,152 @@
-# Croatian translations for Subsurface package
-# Croatian messages for Subsurface.
-# Copyright (C) 2012 THE Subsurface'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Dirk Hohndel <dirk@hohndel.org>, 2012.
-# Ivan Habunek <ivan.habunek@gmail.com>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# dirkhh <dirk@hohndel.org>, 2012
+# ivanhabunek <ivan.habunek@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-13 23:39-0800\n"
-"PO-Revision-Date: 2012-10-18 15:00+0100\n"
-"Last-Translator: Ivan Habunek <ivan.habunek@gmail.com>\n"
-"Language-Team: Croatian\n"
-"Language: hr\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/subsurface/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: hr_HR\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: statistics.c:177
+#: gtk-gui.c:1190
+msgid ""
+"\n"
+"No Events\n"
+msgstr ""
+
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Mjesec"
 
-#: webservice.c:237
+#: webservice.c:289
 msgid " Download"
 msgstr ""
 
-#: download-dialog.c:375
+#: download-dialog.c:374
 msgid " Please select dive computer and device. "
 msgstr "Odaberite ronilačko računalo i naziv uređaja."
 
-#: profile.c:413
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr ""
 
-#: profile.c:414
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr ""
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "#"
 
-#: print.c:308
-#, fuzzy, c-format
+#: print.c:267 print.c:326
+#, c-format
 msgid "%.*f %s"
-msgstr "%.*f %s/min"
+msgstr ""
 
-#: print.c:253 print.c:326
-#, fuzzy, c-format
+#: print.c:344
+#, c-format
 msgid "%.*f %s\n"
-msgstr "%.*f %s/min"
+msgstr ""
 
-#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:605
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr ""
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:82
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
+#: print.c:88
 #, c-format
 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:560
+#: print.c:566
 #, 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:277
+#: divelist.c:569
 #, 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:549
+#: statistics-gtk.c:349
 #, 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:585 statistics.c:556
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:521
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %dh %dmin"
 
-#: statistics.c:523
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dst %dmin"
 
-#: print.c:304
+#: print.c:322
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: profile.c:2148
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
 msgstr ""
 
-#: profile.c:2116
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
 msgstr ""
 
-#: profile.c:2132
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
 msgstr ""
 
-#: profile.c:2135
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
 msgstr ""
 
-#: profile.c:2172
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
@@ -147,49 +155,49 @@ msgid ""
 "EADD:%d%s"
 msgstr ""
 
-#: profile.c:2141
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
 msgstr ""
 
-#: profile.c:2165
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
 msgstr ""
 
-#: profile.c:2144
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
 msgstr ""
 
-#: profile.c:2106
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
 msgstr ""
 
-#: profile.c:2124
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
 msgstr ""
 
-#: profile.c:2127
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
 msgstr ""
 
-#: planner.c:525
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
@@ -198,61 +206,79 @@ msgid ""
 "\n"
 msgstr ""
 
-#: profile.c:2111
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
 msgstr ""
 
-#: profile.c:2160
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
 msgstr ""
 
-#: profile.c:2156
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
 msgstr ""
 
-#: profile.c:2152
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
 msgstr ""
 
-#: dive.c:874
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) ili (%s)"
 
-#: statistics.c:683
-#, fuzzy, c-format
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr ""
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr ""
+
+#: statistics.c:265
+#, c-format
 msgid "(no dives)"
-msgstr "Uredi urone"
+msgstr ""
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr ""
 
-#: planner.c:1315
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr ""
 
-#: planner.c:1314
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr ""
 
-#: planner.c:1320
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr ""
 
-#: print.c:909
+#: print.c:956
 msgid "2 dives per page"
 msgstr ""
 
@@ -260,140 +286,170 @@ msgstr ""
 msgid "2 pcs full suit"
 msgstr ""
 
-#: planner.c:1319
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr ""
 
-#: gtk-gui.c:841
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr ""
 
-#: print.c:905
+#: print.c:952
 msgid "6 dives per page"
 msgstr ""
 
-#: planner.c:1264
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
 msgstr ""
 
-#: planner.c:1190
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr ""
 
-#: gtk-gui.c:1058 gtk-gui.c:1381
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr ""
 
-#: gtk-gui.c:1372
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Dodaj uron..."
 
-#: divelist.c:2397
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Dodaj uron"
 
-#: divelist.c:2499
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Dodaj u gornju grupu"
 
-#: planner.c:1339
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr ""
 
-#: statistics.c:848
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr ""
 
-#: statistics.c:847
-#, fuzzy
+#: statistics-gtk.c:607
 msgid "Air Temp"
-msgstr "Prosj. temp."
+msgstr ""
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr ""
 
-#: download-dialog.c:391
+#: download-dialog.c:390
 msgid "Always prefer downloaded dive"
 msgstr ""
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Tra"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Kol"
 
-#: gtk-gui.c:1394
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Automatsko grupiranje"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:802 statistics.c:839
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Prosj. dubina"
 
-#: statistics.c:810
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Prosj. SAC"
 
-#: statistics.c:785
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Prosj. temp."
 
-#: statistics.c:792
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Prosj. trajanje"
 
-#: profile.c:410
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr ""
 
-#: gtk-gui.c:642
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "Bar"
 
-#: info.c:800 info.c:1253 print.c:487
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Buddy"
 
-#: planner.c:1219
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr ""
 
-#: planner.c:157
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr ""
 
+#: parse-xml.c:1953
+#, c-format
+msgid "Can't open stylesheet (%s)/%s"
+msgstr ""
+
 #: uemis-downloader.c:932
 msgid "Cancelled, exiting cleanly..."
 msgstr ""
@@ -402,136 +458,162 @@ msgstr ""
 msgid "Cancelled..."
 msgstr ""
 
-#: webservice.c:27
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr ""
 
-#: gtk-gui.c:652
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celzijus"
 
-#: gtk-gui.c:564
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Odaberite defaultnu XML datoteku"
 
-#: gtk-gui.c:1900
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Odaberite XML datoteke za uvoz u trenutačnu datoteku"
 
-#: gtk-gui.c:1367
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Zatvori"
 
-#: divelist.c:2517
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Zatvori sve grupe"
 
-#: webservice.c:119
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr ""
 
-#: webservice.c:23
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr ""
 
-#: divelist.c:2489
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Kreiraj novu grupu iznad"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "CuSt"
 
-#: divelist.c:1431 gtk-gui.c:672
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Boca"
 
-#: equipment.c:918 equipment.c:1029 print.c:195
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Boca"
 
-#: planner.c:219
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr ""
 
-#: equipment.c:1539
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Boce"
 
-#: profile.c:2102
-#, fuzzy, c-format
+#: profile.c:2145
+#, c-format
 msgid "D:%.1f %s"
-msgstr "%.*f %s/min"
+msgstr ""
+
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
 
-#: planner.c:1276
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
 msgstr ""
 
-#: divelist.c:1424 print.c:486 statistics.c:830
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Datum i vrijeme"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Pro"
 
-#: gtk-gui.c:709
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Defaultna XML datoteka"
 
-#: gtk-gui.c:1314
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr ""
 
-#: divelist.c:2239 divelist.c:2292 divelist.c:2384
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Obriši uron"
 
-#: divelist.c:2241 divelist.c:2383
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Obriši urone"
 
-#: print.c:486 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Dubina"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Dubina (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Premašeno ograničenje dubine"
 
-#: gtk-gui.c:636
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Dubina:"
 
-#: gtk-gui.c:1273
-#, fuzzy
+#: gtk-gui.c:1528
 msgid "Device Id"
-msgstr "Naziv uređaja"
+msgstr ""
 
 #: download-dialog.c:330
 msgid "Device or mount point"
 msgstr ""
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
-#, fuzzy, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Uron #%1$d - %2$s %4$02d.%3$02d.%5$04d u %6$d:%7$02d"
+#. <trailing text>
+#: info.c:88
+#, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr ""
 
-#: info.c:157 print.c:77
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Uron #%d - "
@@ -541,24 +623,27 @@ msgstr "Uron #%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Uron #%d - %s %d %04d"
 
-#: gtk-gui.c:1981
-#, fuzzy
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
-msgstr "Ronilačko računalo"
+msgstr ""
 
-#: gtk-gui.c:1611 info.c:998 statistics.c:821
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Informacije o uronu"
 
-#: gtk-gui.c:1603
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Bilješke"
 
-#: planner.c:1286
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr ""
 
-#: statistics.c:831
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Vrijeme urona"
 
@@ -578,158 +663,159 @@ msgstr ""
 msgid "Dive data import error"
 msgstr ""
 
-#: print.c:895
-msgid "Dive details"
-msgstr "Podaci o uronu"
-
-#: gps.c:219
-#, fuzzy
+#: gps.c:214
 msgid "Dive locations"
-msgstr "Bilješke"
+msgstr ""
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Voditelj"
 
-#: planner.c:1308
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr ""
 
-#: print.c:486
+#: print.c:502
 msgid "Dive#"
 msgstr "Uron br."
 
-#: gtk-gui.c:697
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Font za listu urona"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Voditelj"
 
-#: statistics.c:782
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Uroni"
 
-#: gtk-gui.c:1377
-#, fuzzy
+#: gtk-gui.c:1636
 msgid "Dives Locations"
-msgstr "Lokacija"
+msgstr ""
 
-#: download-dialog.c:366
+#: download-dialog.c:365
 msgid "Download From Dive Computer"
 msgstr "Preuzmi s ronilačkog računala"
 
-#: gtk-gui.c:1370
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Preuzmi s ronilačkog računala..."
 
-#: webservice.c:210
-#, fuzzy
+#: webservice.c:260
 msgid "Download From Web Service"
-msgstr "Preuzmi s ronilačkog računala"
+msgstr ""
 
-#: gtk-gui.c:1371
-#, fuzzy
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
-msgstr "Preuzmi s ronilačkog računala..."
+msgstr ""
 
-#: webservice.c:29
+#: webservice.c:31
 msgid "Download Success!"
 msgstr ""
 
-#: print.c:486 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Trajanje"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Trajanje (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr ""
 
-#: planner.c:126
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr ""
 
-#: planner.c:1191
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr ""
 
-#: planner.c:1192
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr ""
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Uredi"
 
-#: gtk-gui.c:1386
-#, fuzzy
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
-msgstr "Naziv uređaja"
+msgstr ""
 
-#: gtk-gui.c:1246
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr ""
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Uredi informacije o grupi"
 
-#: divelist.c:2405
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Uredi sažetak grupe"
 
-#: gtk-gui.c:1306
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr ""
 
-#: divelist.c:2381
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Uredi uron"
 
-#: divelist.c:2438 divelist.c:2461
-#, fuzzy
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
-msgstr "Uredi uron"
+msgstr ""
 
-#: divelist.c:2380
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Uredi urone"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Uredi više urona"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Uredi sažetak urona"
 
-#: gtk-gui.c:961
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Uključi/isključi događaje"
 
-#: equipment.c:949 equipment.c:1456
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Kraj"
 
-#: planner.c:1216
-#, fuzzy
+#: planner-gtk.c:288
 msgid "Ending Depth"
-msgstr "Najmanja dubina"
+msgstr ""
 
-#: webservice.c:223
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr ""
 
-#: gtk-gui.c:1607 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Oprema"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr ""
@@ -779,126 +865,136 @@ msgstr ""
 msgid "Event: waiting for user action"
 msgstr ""
 
-#: divelist.c:2513
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Otvori sve"
 
-#: gtk-gui.c:653
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Nije uspjelo otvaranje %i datoteka"
 
-#: parse-xml.c:1448
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Nije uspjelo parsiranje '%s'"
 
-#: parse-xml.c:1443
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Nije uspjelo parsiranje '%s'.\n"
 
-#: file.c:267
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Nije uspjelo čitanje '%s'"
 
-#: file.c:263
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Nije uspjelo čitanje '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Velj"
 
-#: gtk-gui.c:638
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Stope"
 
-#: gtk-gui.c:1357
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Datoteka"
 
-#: gtk-gui.c:1360
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filter"
 
-#: download-dialog.c:385
+#: download-dialog.c:384
 msgid "Force download of all dives"
 msgstr ""
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Pet"
 
-#: gtk-gui.c:859
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr ""
 
-#: planner.c:1331
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr ""
 
-#: gtk-gui.c:849
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr ""
 
-#: planner.c:1330
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr ""
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr ""
 
 #. ++GETTEXT Gas Used is amount used
-#: print.c:197
+#: print.c:203
 msgid "Gas Used"
 msgstr "Potrošeno plina"
 
-#: statistics.c:857
-#, fuzzy
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Potrošeno plina"
 
-#: planner.c:1218
-#, fuzzy
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Potrošeno plina"
 
-#: planner.c:594
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr ""
 
-#: equipment.c:959 print.c:195
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Mješavina"
 
-#: gtk-gui.c:629
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr ""
 
-#: gtk-gui.c:1362
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Pomoć"
 
-#: webservice.c:244
+#: webservice.c:296
 msgid "Idle"
 msgstr ""
 
-#: gtk-gui.c:1369
-msgid "Import XML File(s)..."
-msgstr "Uvezi XML datoteke..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
 
-#: gtk-gui.c:1384
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Informacije"
 
@@ -906,72 +1002,75 @@ msgstr "Informacije"
 msgid "Init Communication"
 msgstr ""
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr ""
 
-#: planner.c:1079
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr ""
 
-#: planner.c:1081
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr ""
 
-#: planner.c:1057
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr ""
 
-#: planner.c:1145
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr ""
 
-#: webservice.c:25
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr ""
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Sij"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Srp"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Lip"
 
-#: gtk-gui.c:1064
-#, fuzzy
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
-msgstr "Linus Torvalds, Dirk Hohndel i drugi, 2011, 2012"
+msgstr ""
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Popis"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Litra"
 
-#: divelist.c:1436 info.c:621 info.c:772 info.c:1247 print.c:487
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Lokacija"
 
-#: gtk-gui.c:1358
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Dnevnik"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Maks."
 
-#: statistics.c:793
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Najduži uron"
 
@@ -983,19 +1082,31 @@ msgstr "Alarm: Baterija pri izmaku"
 msgid "Low Battery Warning"
 msgstr "Upozorenje: Baterija pri izmaku"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr ""
+
+#: main.c:77
 msgid "Mar"
 msgstr "Ožu"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr ""
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Oznaka"
 
-#: print.c:486
+#: print.c:502
 msgid "Master"
 msgstr "Master"
 
@@ -1003,147 +1114,160 @@ msgstr "Master"
 msgid "Max Deco Time Warning"
 msgstr "Upozorenje: Max. vrijeme dekompresije"
 
-#: statistics.c:800 statistics.c:838
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Maks. dubina"
 
-#: statistics.c:808
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Najveći SAC"
 
-#: statistics.c:783
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Maks. temp."
 
-#: print.c:103
+#: print.c:109
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Najveća dubina: %.*f %s\n"
-"Trajanje: %d min\n"
-"%s"
+msgstr "Najveća dubina: %.*f %s\nTrajanje: %d min\n%s"
 
-#: print.c:359
+#: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr ""
 
-#: equipment.c:1454
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Maks. pritisak"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Max."
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Svi"
 
-#: divelist.c:2372
-#, fuzzy
+#: divelist-gtk.c:1641
 msgid "Merge dives"
-msgstr "Obriši urone"
+msgstr ""
 
-#: divelist.c:2413
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Spoji s grupom iznad"
 
-#: divelist.c:2423
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Spoji s grupom ispod"
 
-#: gtk-gui.c:637
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Metar"
 
-#: statistics.c:801
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Najmanja dubina"
 
-#: statistics.c:809
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Najmanji SAC"
 
-#: statistics.c:784
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min. temp."
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Min."
 
-#: gtk-gui.c:703
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Ostale opcije"
 
-#: gtk-gui.c:1268
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr ""
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Pon"
 
-#: gtk-gui.c:1060
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Višeplatformski program za vođenje ronilačkog dnevnika pisan u C-u"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr ""
 
-#: gtk-gui.c:1363
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Novi"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Novi početni broj"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr ""
 
-#: gtk-gui.c:1278 gtk-gui.c:2003
-#, fuzzy
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
-msgstr "Naziv uređaja"
+msgstr ""
 
 #: uemis.c:232
 msgid "No Tank Data"
 msgstr "Nema podatka o boci"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Bilješke"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
 msgstr "Stu"
 
@@ -1151,12 +1275,12 @@ msgstr "Stu"
 msgid "OLF"
 msgstr ""
 
-#: divelist.c:1434 gtk-gui.c:730 print.c:343 statistics.c:855
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Lis"
 
@@ -1164,19 +1288,32 @@ msgstr "Lis"
 msgid "Odd pthread error return"
 msgstr ""
 
-#: gtk-gui.c:1325
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr ""
 
-#: gtk-gui.c:276
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Otvori datoteku"
 
-#: gtk-gui.c:1364
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Otvori..."
 
-#: print.c:167
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:173
 #, c-format
 msgid "Oxygen"
 msgstr ""
@@ -1197,64 +1334,86 @@ msgstr "PO2 Upozorenje: Prebrzi izron"
 msgid "PO2 Green Warning"
 msgstr "PO2 Upozorenje: Zeleno"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "PSI"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr ""
 
-#: gtk-gui.c:1361
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr ""
 
-#: gtk-gui.c:614
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Postavke"
 
-#: gtk-gui.c:1373
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Postavke..."
 
-#: equipment.c:938 equipment.c:944
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Pritisak"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Pritisak:"
 
-#: gtk-gui.c:1387
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr ""
 
-#: print.c:932
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Ispiši odabrane urone"
 
-#: print.c:927
+#: print.c:974
 msgid "Print selection"
 msgstr "Ispiši odabrano"
 
-#: print.c:899
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Vrsta ispisa"
 
-#: gtk-gui.c:1368
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Ispis..."
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:740
-#, fuzzy
+#: gtk-gui.c:898
 msgid "Profile Settings"
-msgstr "Profil"
+msgstr ""
 
-#: gtk-gui.c:1380
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -1266,32 +1425,40 @@ msgstr "RTG Alarm"
 msgid "RGT Warning"
 msgstr "RTG Upozorenje"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Ocjena"
 
 #: uemis-downloader.c:364
-#, fuzzy, c-format
+#, c-format
 msgid "Reading %s %s"
-msgstr "Čitanje urona %s"
+msgstr ""
+
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
 
-#: divelist.c:2084 divelist.c:2428
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Obriši grupu"
 
-#: divelist.c:2507
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Ukloni uron iz grupe"
 
-#: divelist.c:2505
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Ukloni odabrane urone iz grupe"
 
-#: gtk-gui.c:1003
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Renumeriraj"
 
-#: gtk-gui.c:1374
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Renumeriraj..."
 
@@ -1299,73 +1466,69 @@ msgstr "Renumeriraj..."
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr ""
 
-#: divelist.c:1433 gtk-gui.c:682 print.c:377 statistics.c:175 statistics.c:854
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1325
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr ""
 
-#: planner.c:1324
-#, fuzzy
+#: planner-gtk.c:398
 msgid "SAC during dive"
-msgstr "Dodaj uron"
-
-#: file.c:75
-msgid "ZIP file"
-msgstr "ZIP Datoteka"
+msgstr ""
 
 #: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Kršenje sigurnosne stanke"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Sub"
 
-#: gtk-gui.c:1366
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Spremi kao..."
 
-#: gtk-gui.c:206
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Spremi promjene?"
 
-#: divelist.c:1637 gtk-gui.c:143
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Spremi datoteku kao"
 
-#: divelist.c:2445
-#, fuzzy
+#: divelist-gtk.c:1720
 msgid "Save as"
-msgstr "Spremi kao..."
+msgstr ""
 
-#: gtk-gui.c:1365
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Spremi..."
 
-#: planner.c:1217
-#, fuzzy
+#: planner-gtk.c:289
 msgid "Segment Time"
-msgstr "Prosj. trajanje"
+msgstr ""
 
-#: gtk-gui.c:952
-#, fuzzy
+#: gtk-gui.c:1174
 msgid "Select Events"
-msgstr "Odaberi događaje"
+msgstr ""
 
-#: gtk-gui.c:1379
-#, fuzzy
+#: gtk-gui.c:1638
 msgid "Select Events..."
-msgstr "Odaberi događaje..."
+msgstr ""
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
 msgid "Sep"
 msgstr "Ruj"
 
@@ -1373,66 +1536,68 @@ msgstr "Ruj"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Greška pri pisanju u datoteku req.txt\n"
-"Je li Uemis Zurich ispravno prikopčan?"
+msgstr "Greška pri pisanju u datoteku req.txt\nJe li Uemis Zurich ispravno prikopčan?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Min."
 
-#: statistics.c:794
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Najkraći uron"
 
-#: gtk-gui.c:661 gtk-gui.c:724
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Prikaži stupce"
 
-#: gtk-gui.c:820
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr ""
 
-#: gtk-gui.c:803
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr ""
 
-#: gtk-gui.c:836
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr ""
 
-#: gtk-gui.c:828
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr ""
 
-#: divelist.c:2478
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr ""
 
-#: gtk-gui.c:786
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr ""
 
-#: gtk-gui.c:767
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr ""
 
-#: gtk-gui.c:748
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr ""
 
-#: planner.c:243
-#, fuzzy
+#: planner.c:209
 msgid "Simulated Dive"
-msgstr "Obriši uron"
+msgstr ""
 
-#: equipment.c:935 equipment.c:1453
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Veličina"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: Brzina"
@@ -1441,7 +1606,7 @@ msgstr "Alarm: Brzina"
 msgid "Speed Warning"
 msgstr "Upozorenje: Brzina"
 
-#: equipment.c:946 equipment.c:1455
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Početak"
 
@@ -1449,55 +1614,63 @@ msgstr "Početak"
 msgid "Start download"
 msgstr ""
 
-#: statistics.c:772
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Statistika"
 
-#: statistics.c:708
-#, fuzzy, c-format
+#: statistics-gtk.c:468
+#, c-format
 msgid "Statistics %s"
-msgstr "Statistika"
+msgstr ""
 
-#: gtk-gui.c:1615
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Statistika"
 
-#: webservice.c:243
-#, fuzzy
+#: webservice.c:295
 msgid "Status"
-msgstr "Statistika"
+msgstr ""
 
-#: planner.c:575
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr ""
 
-#: divelist.c:1430 gtk-gui.c:692 info.c:806 info.c:1259
+#: parse-xml.c:443
+#, c-format
+msgid "Strange percentage reading %s\n"
+msgstr ""
+
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Odijelo"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "Ned"
 
-#: statistics.c:832
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Površinski interval"
 
-#: planner.c:1309
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr ""
 
-#: planner.c:586
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr ""
 
-#: print.c:913
+#: print.c:960
 msgid "Table print"
 msgstr "Tablični ispis"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Preporučena izmjena boce"
@@ -1506,107 +1679,101 @@ msgstr "Preporučena izmjena boce"
 msgid "Tank Pressure Info"
 msgstr "Podaci od pritisku u boci"
 
-#: gtk-gui.c:722
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr ""
 
-#: gtk-gui.c:667
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Tri"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Čet"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Vrijeme"
 
-#: gtk-gui.c:1501
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
 msgstr ""
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Uključi/isključi povećanje"
 
-#: planner.c:212
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr ""
 
-#: planner.c:1245
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr ""
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Ukupno"
 
-#: statistics.c:791
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Ukupno trajanje"
 
-#: print.c:322
-#, fuzzy, c-format
+#: print.c:340
+#, c-format
 msgid "Total Weight:"
-msgstr "Težina:"
+msgstr ""
 
-#: planner.c:566
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr ""
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:268
+#: divelist.c:583
 #, 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)"
-msgstr[0] "Grupa %1$s, %3$d. %2$s %4$d (%5$d uron)"
-msgstr[1] "Grupa %1$s, %3$d. %2$s %4$d (%5$d urona)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Uto"
 
-#: equipment.c:1452 equipment.c:1480
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Vrsta"
 
 #: uemis-downloader.c:28
-#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
 msgstr ""
-"Uemis Zurich: Datotečni sustav je skoro pun\n"
-"Iskopčajte i ponovo ukopčajte uređaj\n"
-"i pokušajte ponovo"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: Datotečni sustav je pun\n"
-"Iskopčajte i ponovo ukopčajte uređaj\n"
-"i pokušajte ponovo"
+msgstr "Uemis Zurich: Datotečni sustav je pun\nIskopčajte i ponovo ukopčajte uređaj\ni pokušajte ponovo"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1622,84 +1789,100 @@ msgid "Unable to create parser for %s %s"
 msgstr ""
 
 #: libdivecomputer.c:701
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open %s %s (%s)"
-msgstr "Nije uspjelo otvaranje %i datoteka"
+msgstr ""
 
-#: gtk-gui.c:630
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Jedinice"
 
-#: gps.c:217
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr ""
 
-#: webservice.c:230
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr ""
 
-#: gtk-gui.c:1359
+#: gtk-gui.c:1642
+msgid "User Manual"
+msgstr ""
+
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Pregled"
 
-#: info.c:811 statistics.c:840
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr ""
 
-#: gtk-gui.c:646
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Zapremnina:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr ""
 
-#: planner.c:367
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr ""
 
-#: planner.c:1073
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr ""
 
-#: statistics.c:846
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Temperatura vode"
 
-#: webservice.c:258
+#: webservice.c:163
 msgid "Webservice"
 msgstr ""
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Sri"
 
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:687
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Težina"
 
-#: equipment.c:1084 print.c:290
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Težina"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Težina:"
 
-#: gtk-gui.c:131
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML datoteka"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Godina"
 
-#: gtk-gui.c:1375 statistics.c:383
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Godišnje statistike"
 
-#: gtk-gui.c:1989
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
@@ -1708,25 +1891,21 @@ msgid ""
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
 msgstr ""
 
-#: gtk-gui.c:216
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Imate promjena koje nisu spremljene\n"
-"Želite li ih spremiti prije zatvaranja datoteke?"
+msgstr "Imate promjena koje nisu spremljene\nŽelite li ih spremiti prije zatvaranja datoteke?"
 
-#: gtk-gui.c:219 gtk-gui.c:222
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Imate promjena koje nisu spremljene u datoteci: %s \n"
-"Želite li ih spremiti prije zatvaranja datoteke?"
+msgstr "Imate promjena koje nisu spremljene u datoteci: %s \nŽelite li ih spremiti prije zatvaranja datoteke?"
 
-#: divelist.c:544 planner.c:124 planner.c:790 planner.c:791 print.c:172
-#: profile.c:399
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "zrak"
@@ -1735,7 +1914,11 @@ msgstr "zrak"
 msgid "airtime"
 msgstr ""
 
-#: equipment.c:828
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "gležanj"
 
@@ -1743,22 +1926,34 @@ msgstr "gležanj"
 msgid "ascent"
 msgstr ""
 
-#: equipment.c:829
+#: equipment.c:893
 msgid "backplate weight"
 msgstr ""
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:827
+#: equipment.c:891
 msgid "belt"
 msgstr "pojas"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr ""
 
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr ""
@@ -1767,11 +1962,11 @@ msgstr ""
 msgid "ceiling (safety stop)"
 msgstr ""
 
-#: equipment.c:830
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:958
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr ""
 
@@ -1783,6 +1978,10 @@ msgstr ""
 msgid "deco stop"
 msgstr ""
 
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr ""
@@ -1799,41 +1998,48 @@ msgstr ""
 msgid "divetime"
 msgstr ""
 
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr ""
 
-#: planner.c:792
-#, fuzzy
+#: planner.c:780
 msgid "ean"
-msgstr "Sij"
+msgstr ""
 
-#: statistics.c:681
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr ""
 
-#: statistics.c:677
-#, fuzzy, c-format
+#: statistics.c:259
+#, c-format
 msgid "for dive #%d"
-msgstr "Uron #%d - "
+msgstr ""
 
-#: statistics.c:636
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr ""
 
-#: statistics.c:679
-#, fuzzy, c-format
+#: statistics.c:261
+#, c-format
 msgid "for selected dive"
-msgstr "Ispiši odabrane urone"
+msgstr ""
 
-#: statistics.c:643
-#, fuzzy, c-format
+#: statistics.c:224
+#, c-format
 msgid "for selected dives"
-msgstr "Ispiši odabrane urone"
+msgstr ""
+
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
 
-#: dive.c:117 divelist.c:1426 info.c:1178 planner.c:896
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1849,10 +2055,18 @@ msgstr ""
 msgid "heading"
 msgstr ""
 
-#: equipment.c:826
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integrirani"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr ""
@@ -1861,15 +2075,19 @@ msgstr ""
 msgid "jacket"
 msgstr ""
 
-#: dive.c:141 equipment.c:1004 gtk-gui.c:657
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr ""
 
-#: dive.c:137 divelist.c:1429 equipment.c:1006 gtk-gui.c:658
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "US funte"
 
@@ -1877,28 +2095,27 @@ msgstr "US funte"
 msgid "long john"
 msgstr ""
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr ""
 
-#: gtk-gui.c:808
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr ""
 
-#: divelist.c:1435 gtk-gui.c:735
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr ""
 
 #: libdivecomputer.c:153
-#, fuzzy
 msgid "maxdepth"
-msgstr "Maks. dubina"
+msgstr ""
 
 #: uemis-downloader.c:591
 msgid "membrane"
 msgstr ""
 
-#: divelist.c:1427 planner.c:964
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1908,15 +2125,18 @@ msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgstr ""
 
 #: uemis-downloader.c:409
-#, fuzzy
 msgid "more data dive id"
-msgstr "više od %d dana"
+msgstr ""
 
-#: statistics.c:515
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "više od %d dana"
 
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr ""
@@ -1925,25 +2145,33 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: gtk-gui.c:791
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr ""
 
-#: gtk-gui.c:773
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr ""
 
-#: gtk-gui.c:754
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr ""
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr ""
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
 msgid "psi"
 msgstr ""
 
@@ -1955,6 +2183,10 @@ msgstr ""
 msgid "rgbm"
 msgstr ""
 
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr ""
@@ -1971,6 +2203,10 @@ msgstr ""
 msgid "semidry"
 msgstr ""
 
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr ""
@@ -1979,12 +2215,21 @@ msgstr ""
 msgid "surface"
 msgstr ""
 
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr ""
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1066
+#: statistics.c:22
+msgid "training"
+msgstr ""
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
 msgstr "Ivan Habunek"
 
@@ -1992,11 +2237,12 @@ msgstr "Ivan Habunek"
 msgid "transmitter"
 msgstr ""
 
-#: equipment.c:1345 equipment.c:1365
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "nepoznat"
 
-#: libdivecomputer.c:152 print.c:303 statistics.c:561 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "nepoznato"
 
@@ -2008,11 +2254,15 @@ msgstr "nije specificirano"
 msgid "vest"
 msgstr ""
 
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "povreda"
 
-#: equipment.c:1481
+#: equipment.c:1545
 msgid "weight"
 msgstr "težina"
 
@@ -2024,58 +2274,6 @@ msgstr ""
 msgid "workload"
 msgstr ""
 
-#~ msgid "About"
-#~ msgstr "O programu"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Automatski grupiraj urone"
-
-#~ msgid "Delete"
-#~ msgstr "Obriši"
-
-#, fuzzy
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Prosječna\n"
-#~ "dubina"
-
-#, fuzzy
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Ukupno\n"
-#~ "Trajanje"
-
-#~ msgid "Pretty print"
-#~ msgstr "Lijep ispis"
-
-#, fuzzy
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Prosječni\n"
-#~ "SAC"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "Najmanji\n"
-#~ "SAC"
-
-#, fuzzy
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Prosječna\n"
-#~ "temperatura"
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
new file mode 100644
index 000000000..2ea2e490c
--- /dev/null
+++ b/po/it_IT.po
@@ -0,0 +1,2280 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# dirkhh <dirk@hohndel.org>, 2013
+# _fil_ <filippom@gmail.com>, 2012-2013
+# dSpecialist <paolo_motta@hotmail.com>, 2013
+# vinc <vinc.quinto@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: subsurface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 18:00+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/subsurface/language/it_IT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gtk-gui.c:1190
+msgid ""
+"\n"
+"No Events\n"
+msgstr "\nNessun evento\n"
+
+#: statistics-gtk.c:94
+msgctxt "Stats"
+msgid " > Month"
+msgstr " > Mese"
+
+#: webservice.c:289
+msgid " Download"
+msgstr "Download"
+
+#: download-dialog.c:374
+msgid " Please select dive computer and device. "
+msgstr " Selezionare il computer e la periferica"
+
+#: profile.c:429
+msgctxt "Starts with space!"
+msgid " begin"
+msgstr "inizio"
+
+#: profile.c:430
+msgctxt "Starts with space!"
+msgid " end"
+msgstr "fine"
+
+#: statistics-gtk.c:92
+msgid "#"
+msgstr "#"
+
+#: print.c:267 print.c:326
+#, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s"
+
+#: print.c:344
+#, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s\n"
+
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
+#, c-format
+msgid "%.*f %s/min"
+msgstr "%.*f %s/min"
+
+#: planner.c:581
+#, c-format
+msgid "%.0f%s of %s\n"
+msgstr "%.0f%s di %s\n"
+
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
+#: print.c:88
+#, c-format
+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:566
+#, 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:569
+#, 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-gtk.c:349
+#, 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:582 statistics-gtk.c:356
+#, c-format
+msgid "%d min"
+msgstr "%d min"
+
+#: statistics.c:204
+#, c-format
+msgid "%dd %dh %dmin"
+msgstr "%dt %dst %dmin"
+
+#: statistics.c:206
+#, c-format
+msgid "%dh %dmin"
+msgstr "%dst %dmin"
+
+#: print.c:322
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: profile.c:2191
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr "%s⏎ CNS:%u%%"
+
+#: profile.c:2159
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2175
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr "%s⏎ Deco:%umin @ %.0f %s"
+
+#: profile.c:2178
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr "%s⏎ Deco:tempo sconosciuto @ %.0f %s"
+
+#: profile.c:2215
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
+
+#: profile.c:2184
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr "%s⏎ In decompressione"
+
+#: profile.c:2208
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr "%s⏎ MOD:%d%s"
+
+#: profile.c:2187
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr "%s⏎ NDL:%umin"
+
+#: profile.c:2149
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr "%s\nP:%d %s"
+
+#: profile.c:2167
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr "%s⏎ Sosta di sicurezza:%umin @ %.0f %s"
+
+#: profile.c:2170
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr "%s⏎ Sosta di sicurezza:tempo sconosciuto @ %.0f %s"
+
+#: planner.c:501
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2154
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr "%s⏎ T:%.1f %s"
+
+#: profile.c:2203
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr "%s⏎ pHe:%.2fbar"
+
+#: profile.c:2199
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr "%s⏎ pN%s:%.2fbar"
+
+#: profile.c:2195
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr "%s⏎ pO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
+#, c-format
+msgid "(%s) or (%s)"
+msgstr "(%s) oder (%s)"
+
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(clicca per modificare la data/il tempo)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(clicca per modificare data/tempo/profondità)"
+
+#: statistics.c:265
+#, c-format
+msgid "(no dives)"
+msgstr "(nessuna immersione)"
+
+#: gtk-gui.c:2392
+msgid "(nothing)"
+msgstr "(niente)"
+
+#: planner-gtk.c:389
+msgid "0.6 cuft/min"
+msgstr "0.6 cuft/min"
+
+#: planner-gtk.c:388
+msgid "0.7 cuft/min"
+msgstr "0.7 cuft/min"
+
+#: planner-gtk.c:394
+msgid "17 l/min"
+msgstr "17 l/min"
+
+#: print.c:956
+msgid "2 dives per page"
+msgstr "2 immersioni per pagina"
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr "Muta intera 2 pezzi"
+
+#: planner-gtk.c:393
+msgid "20 l/min"
+msgstr "20 l/min"
+
+#: gtk-gui.c:999
+msgid "3m increments for calculated ceiling"
+msgstr "incrementi di 3m per calcolare il ceiling"
+
+#: print.c:952
+msgid "6 dives per page"
+msgstr "6 immersioni per pagina"
+
+#: planner-gtk.c:336
+msgid ""
+"<small>Add segments below.\n"
+"Each line describes part of the planned dive.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
+"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
+msgstr ""
+
+#: planner-gtk.c:262
+msgid "AIR"
+msgstr "ARIA"
+
+#: gtk-gui.c:1284 gtk-gui.c:1641
+msgid "About Subsurface"
+msgstr "Informazioni su Subsurface"
+
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
+msgid "Add Dive..."
+msgstr "Aggiungi Immersione..."
+
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
+msgid "Add dive"
+msgstr "Aggiungi immersione"
+
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
+msgid "Add to trip above"
+msgstr "Aggiungi al viaggio sopra"
+
+#: planner-gtk.c:413
+msgid "Add waypoint"
+msgstr "Aggiungi un punto intermedio"
+
+#: statistics-gtk.c:608
+msgid "Air Press"
+msgstr "Pressione aria"
+
+#: statistics-gtk.c:607
+msgid "Air Temp"
+msgstr "Temperatura aria"
+
+#: info-gtk.c:596
+#, c-format
+msgid "Air Temp in %s"
+msgstr "Temperatura aria in %s"
+
+#: download-dialog.c:390
+msgid "Always prefer downloaded dive"
+msgstr "Preferisci sempre l'immersione scaricata"
+
+#: main.c:77
+msgid "Apr"
+msgstr "Apr"
+
+#: main.c:78
+msgid "Aug"
+msgstr "Ago"
+
+#: gtk-gui.c:1655
+msgid "Autogroup"
+msgstr "Raggruppa"
+
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
+msgctxt "Depth"
+msgid "Average"
+msgstr "Media"
+
+#: statistics-gtk.c:97
+msgctxt "Duration"
+msgid "Average"
+msgstr "Media"
+
+#: statistics-gtk.c:103
+msgctxt "SAC"
+msgid "Average"
+msgstr "Media"
+
+#: statistics-gtk.c:106
+msgctxt "Temp"
+msgid "Average"
+msgstr "Media"
+
+#: statistics-gtk.c:562 statistics-gtk.c:599
+msgid "Avg Depth"
+msgstr "Profondità media"
+
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Profontità media (%s)"
+
+#: statistics-gtk.c:570
+msgid "Avg SAC"
+msgstr "CAS Medio"
+
+#: statistics-gtk.c:545
+msgid "Avg Temp"
+msgstr "Temperatura Media"
+
+#: statistics-gtk.c:552
+msgid "Avg Time"
+msgstr "Tempo Medio"
+
+#: profile.c:426
+#, c-format
+msgid "Bailing out to OC"
+msgstr "Bailing out in corcuito aperto"
+
+#: gtk-gui.c:790
+msgid "Bar"
+msgstr "Bar"
+
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
+msgid "Buddy"
+msgstr "Compagno"
+
+#: planner-gtk.c:291
+msgid "CC SetPoint"
+msgstr "CC SetPoint"
+
+#: planner.c:123
+#, c-format
+msgid "Can't find gas %d/%d"
+msgstr "Non trovo il gas %d/%d"
+
+#: parse-xml.c:1953
+#, c-format
+msgid "Can't open stylesheet (%s)/%s"
+msgstr "Non posso aprire il foglio di calcolo  (%s)/%s"
+
+#: uemis-downloader.c:932
+msgid "Cancelled, exiting cleanly..."
+msgstr "Cancellato, uscita in modo corretto..."
+
+#: libdivecomputer.c:757
+msgid "Cancelled..."
+msgstr "Cancellato..."
+
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
+msgid "Cannot parse response!"
+msgstr "Non posso analizzare la risposta!"
+
+#: gtk-gui.c:800
+msgid "Celsius"
+msgstr "Celsius"
+
+#: gtk-gui.c:686
+msgid "Choose Default XML File"
+msgstr "Selezionare il file XML di default"
+
+#: gtk-gui.c:2294
+msgid "Choose XML Files To Import Into Current Data File"
+msgstr "Selezionare i files XML da importare nel file dei dati"
+
+#: gtk-gui.c:1622
+msgid "Close"
+msgstr "Chiudi"
+
+#: divelist-gtk.c:1815
+msgid "Collapse all"
+msgstr "Minimizza tutto"
+
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
+msgid "Connecting..."
+msgstr "In connessione..."
+
+#: webservice.c:25
+msgid "Connection Error: "
+msgstr "Errore di connessione:"
+
+#: divelist-gtk.c:1787
+msgid "Create new trip above"
+msgstr "Crea un nuovo viaggio sopra"
+
+#: gtk-gui.c:796
+msgid "CuFt"
+msgstr "Piedi cubi"
+
+#: divelist-gtk.c:824 gtk-gui.c:820
+msgid "Cyl"
+msgstr "Bombola"
+
+#: equipment.c:982 equipment.c:1093 print.c:201
+msgid "Cylinder"
+msgstr "Bombola"
+
+#: planner.c:184
+msgid "Cylinder for planning"
+msgstr "Bombola per la pianificazione"
+
+#: equipment.c:1603
+msgid "Cylinders"
+msgstr "Bombole"
+
+#: profile.c:2145
+#, c-format
+msgid "D:%.1f %s"
+msgstr "D:%.1f %s"
+
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
+msgstr "DISCLAIMER / AVVISO: QUESTA È UNA NUOVA IMPLEMENTAZIONE DELL'ALGORITMO DI BUHLMANN E DELL'IMPLEMENTAZIONE DEL  PIANO DI IMMERSIONE BASATO SU CIÒ CHE HA TICEVUTO SOLO UNA LIMITATA QUANTITA DI TEST. E' ALTAMENTE RACCOMANDATO DI NON PIANIFICARE IMMERSIONI BASATE SEMPLICEMENTE SUI RISULTATI DATI QUI."
+
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
+msgid "Date"
+msgstr "Data"
+
+#: info-gtk.c:821
+msgid "Date and Time"
+msgstr "Data e Tempo"
+
+#: info-gtk.c:831
+msgid "Date:"
+msgstr "Data:"
+
+#: main.c:78
+msgid "Dec"
+msgstr "Dic"
+
+#: gtk-gui.c:862
+msgid "Default XML Data File"
+msgstr "File XML di default"
+
+#: gtk-gui.c:1569
+msgid "Delete a dive computer information entry"
+msgstr "Cancella le informazini del computer date qui"
+
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
+msgid "Delete dive"
+msgstr "Cancella immersione"
+
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
+msgid "Delete dives"
+msgstr "Cancella immersioni"
+
+#: print.c:502 statistics-gtk.c:92
+msgid "Depth"
+msgstr "Profondità"
+
+#: uemis.c:222
+msgid "Depth Limit Exceeded"
+msgstr "Limite Profondità Superato"
+
+#: gtk-gui.c:784
+msgid "Depth:"
+msgstr "Profondità:"
+
+#: gtk-gui.c:1528
+msgid "Device Id"
+msgstr "Nome periferica"
+
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr "Periferica o punto di mount"
+
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#. <trailing text>
+#: info.c:88
+#, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr ""
+
+#: info.c:130 print.c:83
+#, c-format
+msgid "Dive #%d - "
+msgstr "Immersione #%d - "
+
+#: libdivecomputer.c:436
+#, c-format
+msgid "Dive %d: %s %d %04d"
+msgstr "Immersione #%d: %s %d %04d"
+
+#: gtk-gui.c:2374
+msgid "Dive Computer Nickname"
+msgstr "Soprannome del computer"
+
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
+msgid "Dive Info"
+msgstr "Informazioni sull'immersione"
+
+#: gtk-gui.c:1872
+msgid "Dive Notes"
+msgstr "Note dell'immersione"
+
+#: planner-gtk.c:360
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr "Piano d'immersione - QUESTA E' SOLO UNA SIMULAZIONE; NON USARE PER IMMERGERSI "
+
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
+msgid "Dive Time"
+msgstr "Tempo d'Immersione"
+
+#: uemis.c:228
+msgid "Dive Time Alert"
+msgstr "Allarme: Tempo d'Immersione"
+
+#: uemis.c:226
+msgid "Dive Time Info"
+msgstr "Info: Tempo d'Immersione"
+
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr "Marca e modello del computer subacqueo"
+
+#: libdivecomputer.c:681
+msgid "Dive data import error"
+msgstr "Errore importazione dati immersione"
+
+#: gps.c:214
+msgid "Dive locations"
+msgstr "Luoghi immersione"
+
+#: info-gtk.c:581
+msgid "Dive master"
+msgstr "Dive master"
+
+#: planner-gtk.c:382
+msgid "Dive starts when?"
+msgstr "L'immersione quando comincia ?"
+
+#: print.c:502
+msgid "Dive#"
+msgstr "Immersione n."
+
+#: gtk-gui.c:845
+msgid "Divelist Font"
+msgstr "Carattere Immersione"
+
+#: info-gtk.c:1001
+msgid "Divemaster"
+msgstr "Divemaster"
+
+#: statistics-gtk.c:542
+msgid "Dives"
+msgstr "Immersioni"
+
+#: gtk-gui.c:1636
+msgid "Dives Locations"
+msgstr "Posizione dell'immersione"
+
+#: download-dialog.c:365
+msgid "Download From Dive Computer"
+msgstr "Scarica dal Computer"
+
+#: gtk-gui.c:1629
+msgid "Download From Dive Computer..."
+msgstr "Scarica dal Computer..."
+
+#: webservice.c:260
+msgid "Download From Web Service"
+msgstr "Scarica da Web Service"
+
+#: gtk-gui.c:1630
+msgid "Download From Web Service..."
+msgstr "Scarica da Web Service..."
+
+#: webservice.c:31
+msgid "Download Success!"
+msgstr "Donload effettuato!"
+
+#: print.c:502 statistics-gtk.c:92
+msgid "Duration"
+msgstr "Durata"
+
+#: info-gtk.c:908
+msgid "Duration (min)"
+msgstr "Durata (min)"
+
+#: info.c:312
+msgid "E"
+msgstr "E"
+
+#: planner.c:88
+#, c-format
+msgid "EAN%d"
+msgstr "EAN%d"
+
+#: planner-gtk.c:263
+msgid "EAN32"
+msgstr "EAN32"
+
+#: planner-gtk.c:264
+msgid "EAN36"
+msgstr "EAN36"
+
+#: info-gtk.c:99
+msgid "Edit"
+msgstr "Modifica"
+
+#: gtk-gui.c:1647
+msgid "Edit Device Names"
+msgstr "Modifica il nome della periferica"
+
+#: gtk-gui.c:1501
+msgid "Edit Dive Computer Nicknames"
+msgstr "Modifica il soprannome del computer"
+
+#: info-gtk.c:663
+msgid "Edit Trip Info"
+msgstr "Modifica Informazioni Viaggio"
+
+#: divelist-gtk.c:1680
+msgid "Edit Trip Summary"
+msgstr "Modifica Riepilogo Viaggio"
+
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr "Modifica il soprannome del computer con un doppio click nel campo del soprannome"
+
+#: divelist-gtk.c:1650
+msgid "Edit dive"
+msgstr "Modifica Immersione"
+
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
+msgid "Edit dive date/time"
+msgstr "Modifica la data/il tempo di immersione"
+
+#: divelist-gtk.c:1649
+msgid "Edit dives"
+msgstr "Modifica Immersioni"
+
+#: info-gtk.c:539
+msgid "Edit multiple dives"
+msgstr "Modifica più immerisoni"
+
+#: info-gtk.c:369
+msgid "Edit trip summary"
+msgstr "Modifica il riepilogo di viaggio"
+
+#: gtk-gui.c:1183
+msgid "Enable / Disable Events"
+msgstr "Abilita / Disabilita Eventi"
+
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
+msgid "End"
+msgstr "Fine"
+
+#: planner-gtk.c:288
+msgid "Ending Depth"
+msgstr "Profondità finale"
+
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
+msgstr "Inserire l'identificativo dell'utente e premere 'Download'. Una volta che il download è completato puoi premere 'Applica' se vuoi applicare le modifiche."
+
+#: gtk-gui.c:1876 info-gtk.c:648
+msgid "Equipment"
+msgstr "Attrezzatura"
+
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
+#: libdivecomputer.c:471
+msgid "Error obtaining water salinity"
+msgstr "Errore nell'ottenimento della salinità dell'acqua"
+
+#: libdivecomputer.c:419
+msgid "Error parsing the datetime"
+msgstr "Errore analizzando la data/il tempo"
+
+#: libdivecomputer.c:441
+msgid "Error parsing the divetime"
+msgstr "Errore analizzando il tempo di immersione"
+
+#: libdivecomputer.c:480
+msgid "Error parsing the gas mix"
+msgstr "Errore analizzando la miscela di gas"
+
+#: libdivecomputer.c:461
+msgid "Error parsing the gas mix count"
+msgstr "Errore analizzando il conteggio della miscela di gas"
+
+#: libdivecomputer.c:451
+msgid "Error parsing the maxdepth"
+msgstr "Errore analizzando la profondità massima"
+
+#: libdivecomputer.c:488
+msgid "Error parsing the samples"
+msgstr "Errore analizzando i campioni"
+
+#: libdivecomputer.c:677
+msgid "Error registering the cancellation handler."
+msgstr "Errore registrando il gestore della cancellazione."
+
+#: libdivecomputer.c:410
+msgid "Error registering the data"
+msgstr "Errore registrando la data"
+
+#: libdivecomputer.c:672
+msgid "Error registering the event handler."
+msgstr "Errore registrando il gestore degli eventi."
+
+#: libdivecomputer.c:645
+#, c-format
+msgid "Event: systime=%<PRId64>, devtime=%u\n"
+msgstr "Evento: systime=%<PRId64>, devtime=%u\n"
+
+#: libdivecomputer.c:622
+msgid "Event: waiting for user action"
+msgstr "Evento: in attesa dell' azione dell'utente."
+
+#: divelist-gtk.c:1811
+msgid "Expand all"
+msgstr "Espandi tutto"
+
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
+msgid "Fahrenheit"
+msgstr "Fahrenheit"
+
+#: gtk-gui.c:124
+#, c-format
+msgid "Failed to open %i files."
+msgstr "Impossibile aprire i file %i"
+
+#: parse-xml.c:1599
+#, c-format
+msgid "Failed to parse '%s'"
+msgstr "Impossibile analizzare  '%s'"
+
+#: parse-xml.c:1598
+#, c-format
+msgid "Failed to parse '%s'.\n"
+msgstr "Impossibile analizzare '%s'.\n"
+
+#: file.c:282
+#, c-format
+msgid "Failed to read '%s'"
+msgstr "Impossibile leggere '%s'"
+
+#: file.c:278
+#, c-format
+msgid "Failed to read '%s'.\n"
+msgstr "Impossibile leggere '%s'.\n"
+
+#: main.c:77
+msgid "Feb"
+msgstr "Feb"
+
+#: gtk-gui.c:786
+msgid "Feet"
+msgstr "Piedi"
+
+#: gtk-gui.c:1612
+msgid "File"
+msgstr "File"
+
+#: gtk-gui.c:1615
+msgid "Filter"
+msgstr "Filtro"
+
+#: download-dialog.c:384
+msgid "Force download of all dives"
+msgstr "Forza il download di tutte le immersioni"
+
+#: main.c:68
+msgid "Fri"
+msgstr "Ven"
+
+#: gtk-gui.c:1017
+msgid "GFhigh"
+msgstr "GFhigh"
+
+#: planner-gtk.c:405
+msgid "GFhigh for plan"
+msgstr "GFhigh del piano"
+
+#: gtk-gui.c:1007
+msgid "GFlow"
+msgstr "GFlow"
+
+#: planner-gtk.c:404
+msgid "GFlow for plan"
+msgstr "GFlow del piano"
+
+#: info-gtk.c:559
+msgid "GPS (WGS84 or GPS format)"
+msgstr "GPS (in formato WGS84 o GPS)"
+
+#. ++GETTEXT Gas Used is amount used
+#: print.c:203
+msgid "Gas Used"
+msgstr "Gas Usato"
+
+#: statistics-gtk.c:617
+msgctxt "Amount"
+msgid "Gas Used"
+msgstr "Gas Usato"
+
+#: planner-gtk.c:290
+msgctxt "Type of"
+msgid "Gas Used"
+msgstr "Gas Usato"
+
+#: planner.c:570
+#, c-format
+msgid "Gas consumption:\n"
+msgstr "Consumo gas:\n"
+
+#: equipment.c:1023 print.c:201
+msgid "Gasmix"
+msgstr "Miscela di gas"
+
+#: gtk-gui.c:777
+msgid "General Settings"
+msgstr "Preferenze genrali"
+
+#: gtk-gui.c:1617
+msgid "Help"
+msgstr "Aiuto"
+
+#: webservice.c:296
+msgid "Idle"
+msgstr "Inattivo"
+
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
+
+#: divelist-gtk.c:1378 gtk-gui.c:1645
+msgid "Info"
+msgstr "Informazioni"
+
+#: uemis-downloader.c:769
+msgid "Init Communication"
+msgstr "Inizializzo la comunicazione"
+
+#: gtk-gui.c:1650
+msgid "Input Plan"
+msgstr "Piano in ingresso"
+
+#: planner-gtk.c:145
+#, c-format
+msgid "Invalid depth - could not parse \"%s\""
+msgstr "Profondità invalida - impossibile analizzare \"%s\""
+
+#: planner-gtk.c:147
+msgid "Invalid depth - values deeper than 400m not supported"
+msgstr "Profondità invalida - i valori più profondi di 400m non sono supportati "
+
+#: planner-gtk.c:118
+#, c-format
+msgid "Invalid gas for row %d"
+msgstr "Gas non valido per la riga %d"
+
+#: planner-gtk.c:207
+msgid "Invalid starttime"
+msgstr "Tempo di partenza non valido"
+
+#: webservice.c:27
+msgid "Invalid user identifier!"
+msgstr "Identificatore dell'utente non valido!"
+
+#. ++GETTEXT: these are three letter months - we allow up to six code bytes
+#: main.c:77
+msgid "Jan"
+msgstr "Gen"
+
+#: main.c:78
+msgid "Jul"
+msgstr "Lug"
+
+#: main.c:77
+msgid "Jun"
+msgstr "Giu"
+
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
+msgstr "Linus Torvalds, Dirk Hohndel, e altri, 2011, 2012, 2013"
+
+#: gtk-gui.c:1643
+msgid "List"
+msgstr "Lista"
+
+#: gtk-gui.c:795
+msgid "Liter"
+msgstr "Litri"
+
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
+msgid "Location"
+msgstr "Luogo"
+
+#: gtk-gui.c:1613
+msgid "Log"
+msgstr "Log"
+
+#: statistics-gtk.c:99
+msgctxt "Duration"
+msgid "Longest"
+msgstr "Più lunga"
+
+#: statistics-gtk.c:553
+msgid "Longest Dive"
+msgstr "Immersione più lunga"
+
+#: uemis.c:236
+msgid "Low Battery Alert"
+msgstr "Allarme: Batteria scarica"
+
+#: uemis.c:234
+msgid "Low Battery Warning"
+msgstr "Avviso: Batteria Scarica"
+
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Provider delle mappe"
+
+#: main.c:77
+msgid "Mar"
+msgstr "Mar"
+
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
+msgid "Mark location here"
+msgstr "Marca la posizione qui"
+
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
+#: uemis.c:230
+msgid "Marker"
+msgstr "Marcatore"
+
+#: print.c:502
+msgid "Master"
+msgstr "Master"
+
+#: uemis.c:224
+msgid "Max Deco Time Warning"
+msgstr "Avviso: Massimo tempo di decompressione"
+
+#: statistics-gtk.c:560 statistics-gtk.c:598
+msgid "Max Depth"
+msgstr "Profondità Massima"
+
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Profondità massima  (%s):"
+
+#: statistics-gtk.c:568
+msgid "Max SAC"
+msgstr "CAS Massimo"
+
+#: statistics-gtk.c:543
+msgid "Max Temp"
+msgstr "Temperatura Massima"
+
+#: print.c:109
+#, c-format
+msgid ""
+"Max depth: %.*f %s\n"
+"Duration: %d min\n"
+"%s"
+msgstr "Profontià massima: %.*f %s\nDurata: %d min\n%s"
+
+#: print.c:377
+#, c-format
+msgid "Max. CNS"
+msgstr "CNS massimo"
+
+#: equipment.c:1518
+msgid "MaxPress"
+msgstr "Pressione Massima"
+
+#: statistics-gtk.c:102
+msgctxt "Depth"
+msgid "Maximum"
+msgstr "Massimo"
+
+#: statistics-gtk.c:105
+msgctxt "SAC"
+msgid "Maximum"
+msgstr "Massimo"
+
+#: statistics-gtk.c:108
+msgctxt "Temp"
+msgid "Maximum"
+msgstr "Massimo"
+
+#: main.c:77
+msgid "May"
+msgstr "Mag"
+
+#: divelist-gtk.c:1641
+msgid "Merge dives"
+msgstr "Unisci immersioni"
+
+#: divelist-gtk.c:1688
+msgid "Merge trip with trip above"
+msgstr "Raggruppa il viaggio con il viaggio sopra"
+
+#: divelist-gtk.c:1698
+msgid "Merge trip with trip below"
+msgstr "Raggruppa il viaggio con il viaggio sotto"
+
+#: gtk-gui.c:785
+msgid "Meter"
+msgstr "Metro"
+
+#: statistics-gtk.c:561
+msgid "Min Depth"
+msgstr "Profondità Minima"
+
+#: statistics-gtk.c:569
+msgid "Min SAC"
+msgstr "Min. CAS"
+
+#: statistics-gtk.c:544
+msgid "Min Temp"
+msgstr "Temperatura Minima"
+
+#: statistics-gtk.c:101
+msgctxt "Depth"
+msgid "Minimum"
+msgstr "Minimo"
+
+#: statistics-gtk.c:104
+msgctxt "SAC"
+msgid "Minimum"
+msgstr "Minimo"
+
+#: statistics-gtk.c:107
+msgctxt "Temp"
+msgid "Minimum"
+msgstr "Minimo"
+
+#: gtk-gui.c:851
+msgid "Misc. Options"
+msgstr "Opzioni"
+
+#: gtk-gui.c:1523
+msgid "Model"
+msgstr "Modello"
+
+#: main.c:68
+msgid "Mon"
+msgstr "Lun"
+
+#: gtk-gui.c:1286
+msgid "Multi-platform divelog software in C"
+msgstr "Programma Multi-piattaforma in C per il log delle immersioni"
+
+#: info.c:311
+msgid "N"
+msgstr "N"
+
+#: gtk-gui.c:1618
+msgid "New"
+msgstr "Nuovo"
+
+#: gtk-gui.c:1238
+msgid "New starting number"
+msgstr "Nuovo numero di inizio"
+
+#: gtk-gui.c:1649
+msgid "Next DC"
+msgstr "DC successivo"
+
+#: gtk-gui.c:1533 gtk-gui.c:2396
+msgid "Nickname"
+msgstr "Nickname"
+
+#: uemis.c:232
+msgid "No Tank Data"
+msgstr "Nessun dato sulla bombola"
+
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
+msgid "Notes"
+msgstr "Note"
+
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
+msgid "Nov"
+msgstr "Nov"
+
+#: libdivecomputer.c:153
+msgid "OLF"
+msgstr ""
+
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
+#, c-format
+msgid "OTU"
+msgstr "OTU"
+
+#: main.c:78
+msgid "Oct"
+msgstr "Ott"
+
+#: libdivecomputer.c:770
+msgid "Odd pthread error return"
+msgstr "Errore di ditorno del pthread dispari"
+
+#: gtk-gui.c:1580
+msgid "Ok to delete the selected entry?"
+msgstr "Ok per cancellare le voci selezionate?"
+
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
+msgid "Open File"
+msgstr "Apri File"
+
+#: gtk-gui.c:1619
+msgid "Open..."
+msgstr "Apri..."
+
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:173
+#, c-format
+msgid "Oxygen"
+msgstr "Ossigeno"
+
+#: libdivecomputer.c:153
+msgid "PO2"
+msgstr "PO2"
+
+#: uemis.c:210
+msgid "PO2 Ascend Alarm"
+msgstr "Allarme Incremento PO2"
+
+#: uemis.c:208
+msgid "PO2 Ascend Warning"
+msgstr "Avviso Incremento PO2"
+
+#: uemis.c:205
+msgid "PO2 Green Warning"
+msgstr "Avviso PO2 Verde"
+
+#: gtk-gui.c:791
+msgid "PSI"
+msgstr "PSI"
+
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
+msgid "Pick on map"
+msgstr "Segliere sulla mappa"
+
+#: gtk-gui.c:1616
+msgid "Planner"
+msgstr "Pianificatore"
+
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: gtk-gui.c:1632
+msgid "Preferences..."
+msgstr "Preferenze..."
+
+#: equipment.c:1002 equipment.c:1008
+msgid "Pressure"
+msgstr "Pressione"
+
+#: gtk-gui.c:789
+msgid "Pressure:"
+msgstr "Pressione:"
+
+#: gtk-gui.c:1648
+msgid "Prev DC"
+msgstr "DC precedente"
+
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
+msgid "Print only selected dives"
+msgstr "Stampa solo le immersioni selezionate"
+
+#: print.c:974
+msgid "Print selection"
+msgstr "Stampa selezione"
+
+#: print.c:939 print.c:946
+msgid "Print type"
+msgstr "Stampa tipo"
+
+#: gtk-gui.c:1623
+msgid "Print..."
+msgstr "Stampa..."
+
+#: gtk-gui.c:1644
+msgid "Profile"
+msgstr "Profilo"
+
+#: gtk-gui.c:898
+msgid "Profile Settings"
+msgstr "Impostazioni profilo"
+
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
+msgid "Quit"
+msgstr "Esci"
+
+#: uemis.c:218
+msgid "RGT Alert"
+msgstr "Allarme RGT"
+
+#: uemis.c:216
+msgid "RGT Warning"
+msgstr "Avviso RGT"
+
+#: info-gtk.c:587 info-gtk.c:1007
+msgid "Rating"
+msgstr "Valutazione"
+
+#: uemis-downloader.c:364
+#, c-format
+msgid "Reading %s %s"
+msgstr "Sto leggendo %s %s"
+
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
+msgid "Remove Trip"
+msgstr "Rimuovi Viaggio"
+
+#: divelist-gtk.c:1805
+msgid "Remove dive from trip"
+msgstr "Rimuovi immersione dal viaggio"
+
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
+msgid "Remove selected dives from trip"
+msgstr "Rimuovi le immersioni selezionate dal viaggio"
+
+#: gtk-gui.c:1229
+msgid "Renumber"
+msgstr "Rinumera"
+
+#: gtk-gui.c:1633
+msgid "Renumber..."
+msgstr "Rinumera..."
+
+#: download-dialog.c:141
+msgid "Retry"
+msgstr "Riprova"
+
+#: info.c:311
+msgid "S"
+msgstr ""
+
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
+#, c-format
+msgid "SAC"
+msgstr "CAS"
+
+#: planner-gtk.c:399
+msgid "SAC during decostop"
+msgstr "CAS durante la sosta di deco"
+
+#: planner-gtk.c:398
+msgid "SAC during dive"
+msgstr "CAS durante l'immersione"
+
+#: uemis.c:198
+msgid "Safety Stop Violation"
+msgstr "Violazione della tappa di sicurezza"
+
+#: main.c:68
+msgid "Sat"
+msgstr "Sab"
+
+#: gtk-gui.c:1621
+msgid "Save As..."
+msgstr "Salva Come..."
+
+#: gtk-gui.c:227
+msgid "Save Changes?"
+msgstr "Salvare le modifiche?"
+
+#: divelist-gtk.c:1028 gtk-gui.c:164
+msgid "Save File As"
+msgstr "Salvare il File come"
+
+#: divelist-gtk.c:1720
+msgid "Save as"
+msgstr "Salva come"
+
+#: gtk-gui.c:1620
+msgid "Save..."
+msgstr "Salva..."
+
+#: planner-gtk.c:289
+msgid "Segment Time"
+msgstr "Segmento di tempo"
+
+#: gtk-gui.c:1174
+msgid "Select Events"
+msgstr "Seleziona eventi"
+
+#: gtk-gui.c:1638
+msgid "Select Events..."
+msgstr "Seleziona eventi..."
+
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
+msgid "Sep"
+msgstr "Set"
+
+#: uemis-downloader.c:30
+msgid ""
+"Short write to req.txt file\n"
+"Is the Uemis Zurich plugged in correctly?"
+msgstr "Scrittura breve sul file req.txt\nLo Uemis Zurich e' collegato correttamente?"
+
+#: statistics-gtk.c:98
+msgctxt "Duration"
+msgid "Shortest"
+msgstr "Più corto"
+
+#: statistics-gtk.c:554
+msgid "Shortest Dive"
+msgstr "Immersione più corta"
+
+#: gtk-gui.c:809 gtk-gui.c:882
+msgid "Show Columns"
+msgstr "Visualizza Colonne"
+
+#: gtk-gui.c:978
+msgid "Show EAD, END, EADD"
+msgstr "Visualizza EAD, END, EADD"
+
+#: gtk-gui.c:961
+msgid "Show MOD"
+msgstr "Visualizza MOD"
+
+#: gtk-gui.c:994
+msgid "Show calculated ceiling"
+msgstr "Mostra il ceiling calcolato"
+
+#: gtk-gui.c:986
+msgid "Show dc reported ceiling in red"
+msgstr "Mostra in rosso il DC segnalato dal  ceiling"
+
+#: divelist-gtk.c:1776
+msgid "Show in map"
+msgstr "Visualizza nella mappa"
+
+#: gtk-gui.c:944
+msgid "Show pHe graph"
+msgstr "Visualizza la pHe nel il grafo"
+
+#: gtk-gui.c:925
+#, c-format
+msgid "Show pN%s graph"
+msgstr "Visualizza la pN%s nel grafo"
+
+#: gtk-gui.c:906
+#, c-format
+msgid "Show pO%s graph"
+msgstr "Visualizza la pO%s  nel grafo"
+
+#: planner.c:209
+msgid "Simulated Dive"
+msgstr "Immersione simulata"
+
+#: equipment.c:999 equipment.c:1517
+msgid "Size"
+msgstr "Dimensione"
+
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
+#: uemis.c:200
+msgid "Speed Alarm"
+msgstr "Allarme Risalita Veloce"
+
+#: uemis.c:203
+msgid "Speed Warning"
+msgstr "Avviso Risalita Veloce"
+
+#: equipment.c:1010 equipment.c:1519
+msgid "Start"
+msgstr "Inizio"
+
+#: uemis-downloader.c:782
+msgid "Start download"
+msgstr "Inizio download"
+
+#: statistics-gtk.c:532
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: statistics-gtk.c:468
+#, c-format
+msgid "Statistics %s"
+msgstr "Statistiche %s"
+
+#: gtk-gui.c:1884
+msgid "Stats"
+msgstr "Statistiche"
+
+#: webservice.c:295
+msgid "Status"
+msgstr "Stato"
+
+#: planner.c:551
+#, c-format
+msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
+msgstr "Fermati a %.*f %s per %d:%02d min - tempo trascorso %d:%02u su %s\n"
+
+#: parse-xml.c:443
+#, c-format
+msgid "Strange percentage reading %s\n"
+msgstr "Lettura di strane percentuali %s\n\n"
+
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
+msgid "Suit"
+msgstr "Muta"
+
+#. ++GETTEXT: these are three letter days - we allow up to six code bytes
+#: main.c:68
+msgid "Sun"
+msgstr "Dom"
+
+#: statistics-gtk.c:592
+msgid "Surf Intv"
+msgstr "Intervallo di Superficie"
+
+#: planner-gtk.c:383
+msgid "Surface Pressure (mbar)"
+msgstr "Pressione di superfice (mbar)"
+
+#: planner.c:562
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr "Cambiare gas a %s\n"
+
+#: print.c:960
+msgid "Table print"
+msgstr "Stampa Tabella"
+
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
+#: uemis.c:220
+msgid "Tank Change Suggested"
+msgstr "Suggerito Cambio Bombola"
+
+#: uemis.c:214
+msgid "Tank Pressure Info"
+msgstr "Informazione Pressione della bombola"
+
+#: gtk-gui.c:880
+msgid "Tec Settings"
+msgstr "Impostazioni tec"
+
+#: gtk-gui.c:815
+msgid "Temp"
+msgstr "Temperatura"
+
+#: statistics-gtk.c:92
+msgid "Temperature"
+msgstr "Temperatura"
+
+#: gtk-gui.c:799
+msgid "Temperature:"
+msgstr "Temperatura:"
+
+#: gtk-gui.c:1646
+msgid "Three"
+msgstr "Albero"
+
+#: main.c:68
+msgid "Thu"
+msgstr "Gio"
+
+#: info-gtk.c:838
+msgid "Time"
+msgstr "Tempo"
+
+#: gtk-gui.c:1768
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr "Per modificare le informazioni dell'immersione\ndoppio click nella lista immersioni"
+
+#: gtk-gui.c:1656
+msgid "Toggle Zoom"
+msgstr "Zoom Alternativo"
+
+#: planner.c:286
+msgid "Too many gas mixes"
+msgstr "Troppe miscele gas"
+
+#: planner-gtk.c:317
+msgid "Too many waypoints"
+msgstr "Troppi punti di riferimento"
+
+#: statistics-gtk.c:96
+msgctxt "Duration"
+msgid "Total"
+msgstr "Totale"
+
+#: statistics-gtk.c:551
+msgid "Total Time"
+msgstr "Tempo Totale"
+
+#: print.c:340
+#, c-format
+msgid "Total Weight:"
+msgstr "Peso totale:"
+
+#: planner.c:542
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:583
+#, 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)"
+msgstr[0] "Viaggio %1$s, %3$d. %2$s %4$d (%5$d Immersione)"
+msgstr[1] "Viaggio %1$s, %3$d. %2$s %4$d (%5$d Immersioni)"
+
+#: main.c:68
+msgid "Tue"
+msgstr "Mar"
+
+#: equipment.c:1516 equipment.c:1544
+msgid "Type"
+msgstr "Tipo"
+
+#: uemis-downloader.c:28
+msgid ""
+"Uemis Zurich: File System is almost full\n"
+"Disconnect/reconnect the dive computer\n"
+"and click 'Retry'"
+msgstr "Uemis Zurich: Il File System è quasi pieno\nDisconnettere/riconnettere il computer subacqueo\ne cliccare \"Riprova\""
+
+#: uemis-downloader.c:29
+msgid ""
+"Uemis Zurich: File System is full\n"
+"Disconnect/reconnect the dive computer\n"
+"and try again"
+msgstr "Uemis Zurich: File System pieno\nDisconnettere/connettere il computer\ne riprovare"
+
+#: uemis-downloader.c:771
+msgid "Uemis init failed"
+msgstr "Impossibile inizializzare l'Uemis"
+
+#: libdivecomputer.c:699
+msgid "Unable to create libdivecomputer context"
+msgstr ""
+
+#: libdivecomputer.c:404
+#, c-format
+msgid "Unable to create parser for %s %s"
+msgstr "Impossibile creare un parser per %s %s"
+
+#: libdivecomputer.c:701
+#, c-format
+msgid "Unable to open %s %s (%s)"
+msgstr "Impossibile aprire %s %s (%s)"
+
+#: gtk-gui.c:778
+msgid "Units"
+msgstr "Unità"
+
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
+msgid "Use right click to mark dive location at cursor"
+msgstr "Usare il pulsante destro per marcare un sito d'Immersione"
+
+#: webservice.c:282 webservice.c:333
+msgid "User Identifier"
+msgstr "Identificatore utente"
+
+#: gtk-gui.c:1642
+msgid "User Manual"
+msgstr "Manuale Utente"
+
+#: gtk-gui.c:1614
+msgid "View"
+msgstr "Visualizza"
+
+#: info-gtk.c:593 statistics-gtk.c:600
+msgid "Visibility"
+msgstr "Visibilità"
+
+#: gtk-gui.c:794
+msgid "Volume:"
+msgstr "Volume:"
+
+#: info.c:312
+msgid "W"
+msgstr "W"
+
+#: planner-gtk.c:162
+msgid "Warning - extremely long dives can cause long calculation time"
+msgstr "Avviso - immersioni estremamente lunghe possono causare un lungo tempo di elaborazione"
+
+#: planner-gtk.c:137
+msgid "Warning - planning very deep dives can take excessive amounts of time"
+msgstr "Avviso - pianificare immersioni molto profonde può impiegare un tempo eccessiso"
+
+#: statistics-gtk.c:606
+msgid "Water Temp"
+msgstr "Temperatura dell'acqua"
+
+#: webservice.c:163
+msgid "Webservice"
+msgstr "Webservice"
+
+#: main.c:68
+msgid "Wed"
+msgstr "Mer"
+
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
+msgid "Weight"
+msgstr "Peso"
+
+#: equipment.c:1148 print.c:308
+#, c-format
+msgid "Weight System"
+msgstr "Sistema di Zavorra"
+
+#: gtk-gui.c:804
+msgid "Weight:"
+msgstr "Peso:"
+
+#: gtk-gui.c:152
+msgid "XML file"
+msgstr "File XML"
+
+#: statistics-gtk.c:92
+msgid "Year"
+msgstr "Anno"
+
+#: gtk-gui.c:1634 statistics-gtk.c:295
+msgid "Yearly Statistics"
+msgstr "Statistiche Annuali"
+
+#: gtk-gui.c:2382
+#, c-format
+msgid ""
+"You already have a dive computer of this model\n"
+"named %s\n"
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
+msgstr "Già possiedi un computer subacqueo di questo modello⏎ chiamato %s⏎ Subsurface può mantenere il soprannome di questa periferica per distinguerla da quella esistente. Il modello di default e l'ID della periferica sono mostrati sotto.⏎ Se non vuoi dare un nome a questo computer subacqueo clicca 'Cancella' e Subsurface mostrerà semplicemente il suo modello e il suo nome (il che può significare che non si può distinguere i due computer subacquei a parte che nei logs) "
+
+#: gtk-gui.c:237
+msgid ""
+"You have unsaved changes\n"
+"Would you like to save those before closing the datafile?"
+msgstr "Non hai salvato le modifiche.\nVuoi salvare prima di chiudere il file dei dati?"
+
+#: gtk-gui.c:240 gtk-gui.c:243
+#, c-format
+msgid ""
+"You have unsaved changes to file: %s \n"
+"Would you like to save those before closing the datafile?"
+msgstr "Non hai salvato le modifiche al file %s.\nVuoi salvare prima di chiudere il file dei dati?"
+
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
+#, c-format
+msgid "air"
+msgstr "aria"
+
+#: libdivecomputer.c:153
+msgid "airtime"
+msgstr "tempo in aria"
+
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
+msgid "ankle"
+msgstr "caviglia"
+
+#: libdivecomputer.c:149
+msgid "ascent"
+msgstr "risalita"
+
+#: equipment.c:893
+msgid "backplate weight"
+msgstr "peso della piastra"
+
+#: dive.c:48
+msgid "bar"
+msgstr "bar"
+
+#: equipment.c:891
+msgid "belt"
+msgstr "cintura"
+
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
+msgid "bookmark"
+msgstr "segnalibro"
+
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "ceiling"
+msgstr "ceiling"
+
+#: libdivecomputer.c:152
+msgid "ceiling (safety stop)"
+msgstr "ceiling (sosta di sicurezza)"
+
+#: equipment.c:894
+msgid "clip-on"
+msgstr "clip-on"
+
+#: dive.c:93 planner.c:951
+msgid "cuft"
+msgstr "piedi cubi"
+
+#: uemis-downloader.c:384
+msgid "data"
+msgstr "data"
+
+#: libdivecomputer.c:149
+msgid "deco stop"
+msgstr "deco stop"
+
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "deepstop"
+msgstr "deepstop"
+
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr "id del log d'immersione"
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "divetime"
+msgstr "durata immersione"
+
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr "Muta stagna"
+
+#: planner.c:780
+msgid "ean"
+msgstr "ean"
+
+#: statistics.c:263
+#, c-format
+msgid "for all dives"
+msgstr "per tutte le immersioni"
+
+#: statistics.c:259
+#, c-format
+msgid "for dive #%d"
+msgstr "per l'immersione #%d"
+
+#: statistics.c:217
+#, c-format
+msgid "for dives #"
+msgstr "per l'immersione #"
+
+#: statistics.c:261
+#, c-format
+msgid "for selected dive"
+msgstr "per l'immersione selezionata"
+
+#: statistics.c:224
+#, c-format
+msgid "for selected dives"
+msgstr "per le immersioni selezionate"
+
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
+msgid "ft"
+msgstr "ft"
+
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr "muta intera"
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
+msgid "gaschange"
+msgstr "cambio gas"
+
+#: libdivecomputer.c:153
+msgid "heading"
+msgstr "intestazione"
+
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
+msgid "integrated"
+msgstr "integrato"
+
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
+#: libdivecomputer.c:171
+msgid "invalid event number"
+msgstr "numero evento non valido"
+
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr "GAV"
+
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
+msgid "kg"
+msgstr "kg"
+
+#: dive.c:88
+msgid "l"
+msgstr "l"
+
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
+msgid "lbs"
+msgstr "lbs"
+
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr "long john"
+
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
+msgid "m"
+msgstr "m"
+
+#: gtk-gui.c:966
+msgid "max ppO2"
+msgstr "max ppO2"
+
+#: divelist-gtk.c:828 gtk-gui.c:893
+msgid "maxCNS"
+msgstr "max CNS"
+
+#: libdivecomputer.c:153
+msgid "maxdepth"
+msgstr "profondità massima"
+
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr "membrana"
+
+#: divelist-gtk.c:820 planner.c:957
+msgid "min"
+msgstr "min"
+
+#: libdivecomputer.c:630
+#, c-format
+msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
+msgstr "modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)"
+
+#: uemis-downloader.c:409
+msgid "more data dive id"
+msgstr ""
+
+#: statistics.c:198
+#, c-format
+msgid "more than %d days"
+msgstr "più di %d giorni"
+
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr "tempo di non stop"
+
+#: libdivecomputer.c:149
+msgid "none"
+msgstr "nessuno"
+
+#: gtk-gui.c:949
+msgid "pHe threshold"
+msgstr "limite pHe"
+
+#: gtk-gui.c:931
+#, c-format
+msgid "pN%s threshold"
+msgstr "limite pN%s"
+
+#: gtk-gui.c:912
+#, c-format
+msgid "pO%s threshold"
+msgstr "limite pO%s"
+
+#: dive.c:44
+msgid "pascal"
+msgstr "pascal"
+
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
+msgid "psi"
+msgstr "psi"
+
+#: libdivecomputer.c:149
+msgid "rbt"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "rgbm"
+msgstr "rgbm"
+
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "safety stop"
+msgstr "sosta di sicurezza"
+
+#: libdivecomputer.c:151
+msgid "safety stop (mandatory)"
+msgstr "sosta di sicurezza (obbligatoria)"
+
+#: libdivecomputer.c:151
+msgid "safety stop (voluntary)"
+msgstr "sosta di sicurezza (facoltativa)"
+
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr "semi stagna"
+
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr "shorty"
+
+#: libdivecomputer.c:150
+msgid "surface"
+msgstr "superficie"
+
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
+#: libdivecomputer.c:154
+msgid "tissue level warning"
+msgstr "avviso del livello dei tessuti"
+
+#: statistics.c:22
+msgid "training"
+msgstr ""
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
+msgid "translator-credits"
+msgstr "Filippo Moser"
+
+#: libdivecomputer.c:150
+msgid "transmitter"
+msgstr "trasmettitore"
+
+#: equipment.c:1409 equipment.c:1429
+msgid "unkn"
+msgstr "sconosciuto"
+
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: equipment.c:540
+msgid "unspecified"
+msgstr "non specificato"
+
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr "maglia"
+
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "violation"
+msgstr "violazione"
+
+#: equipment.c:1545
+msgid "weight"
+msgstr "peso"
+
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr "muta umida"
+
+#: libdivecomputer.c:149
+msgid "workload"
+msgstr "carico di lavoro"
+
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 52e1cead5..620269ca0 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -1,37 +1,36 @@
-# Norwegian translations for Subsurface package
-# Norwegian messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# henrik <subsurface@henrik.synth.no>, 2013
+# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-19 21:01+0100\n"
-"Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
-"Language-Team: Norwegian Bokmål\n"
-"Language: nb_NO\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/subsurface/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Basepath: ..\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
+msgstr "\nIngen hendelser\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Måned"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr "Last ned"
 
@@ -39,17 +38,17 @@ msgstr "Last ned"
 msgid " Please select dive computer and device. "
 msgstr " Velg dykkecomputer og enhet"
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr " start"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr " slutt"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "#"
 
@@ -63,52 +62,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s av %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dt %dt %dmin"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dt %dmin"
@@ -118,185 +118,167 @@ msgstr "%dt %dmin"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Kalkulert tak %.0f %s"
+msgstr "%s\nKalkulert tak %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko:%umin @ %.0f %s"
+msgstr "%s\nDeko:%umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko:ukjent tid @ %.0f %s"
+msgstr "%s\nDeko:ukjent tid @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"I deko"
+msgstr "%s\nI deko"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Sikkerhetsstopp:%umin @ %.0f %s"
+msgstr "%s\nSikkerhetsstopp:%umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Sikkerhetsstopp: ukjent tid @ %.0f %s"
+msgstr "%s\nSikkerhetsstopp: ukjent tid @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface dykkeplan\n"
-"basert på GFlow = %.0f og GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface dykkeplan\nbasert på GFlow = %.0f og GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr "%s kl %d:%02u"
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
 msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
 
-#: dive.c:918
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) eller (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(klikk for å redigere dato/tid)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(klikk for å redigere dato/tid/dybde)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(ingen dykk)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(ingenting)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 ft³/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 ft³/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 dykk per side"
 
@@ -304,67 +286,78 @@ msgstr "2 dykk per side"
 msgid "2 pcs full suit"
 msgstr "todelt drakt"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "3m intervaller for kalkulert tak"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 dykk per side"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
-msgstr ""
-"<small>Legg til segmenter.\n"
-"Hver rad beskriver en del av det planlagte dykket.\n"
-"En rad med dybde, tid og gass beskriver et segment som slutter på den gitte dybden, tar den gitte tiden (hvis relativ tid er brukt, som '+3:30') eller slutter på den gitte tiden (hvis absolutt tid er brukt), og bruker den angitte gassen.\n"
-"Et tomt gassfelt betyr 'bruk forrige gass' (eller luft hvis det ikke var noen tidligere gass).\n"
-"En rad som har dybde og gass, men ikke tid er spesiell: planleggeren vet da at gassen er tilgjengelig når den oppgitte dybden nåes.\n"
-"CC setpoint spesifiserer rebreather-dykk, ikke bruk ved åpent system (OC).</small>\n"
-
-#: planner.c:1198
+msgstr "<small>Legg til segmenter.\nHver rad beskriver en del av det planlagte dykket.\nEn rad med dybde, tid og gass beskriver et segment som slutter på den gitte dybden, tar den gitte tiden (hvis relativ tid er brukt, som '+3:30') eller slutter på den gitte tiden (hvis absolutt tid er brukt, som '@5:00'), og bruker den angitte gassen.\nEt tomt gassfelt betyr 'bruk forrige gass' (eller luft hvis det ikke var noen tidligere gass). En rad som har dybde og gass, men ikke tid er spesiell: planleggeren vet da at gassen er tilgjengelig når den oppgitte dybden nåes.\nCC setpoint spesifiserer rebreather-dykk, ikke bruk ved åpent system (OC).</small>\n"
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "Luft"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "Om Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr "Legg til"
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Nytt dykk..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr "Legg til bokmerke her"
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Nytt dykk"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr "Legg til gassbytte her"
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr "Legg til gassbytte ved %d:%02u"
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Legg til i turen over"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Legg til rad"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Lufttrykk"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Lufttemp."
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Lufttemp i %s"
@@ -373,80 +366,89 @@ msgstr "Lufttemp i %s"
 msgid "Always prefer downloaded dive"
 msgstr "Foretrekk alltid nedlastet dykk"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "apr"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "aug"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Grupper automatisk"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr "Tilgjengelige gasser"
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Snittdybde"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Snittdybde (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Snitt-SAC"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Snitt-temp."
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Snitt-tid"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Bytter til OC"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Buddy"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC setpoint"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Finner ikke gassen %d/%d"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
-msgstr ""
+msgstr "Kan ikke åpne stilark (%s)/%s"
 
 #: uemis-downloader.c:932
 msgid "Cancelled, exiting cleanly..."
@@ -456,121 +458,143 @@ msgstr "Avbrutt, går ut..."
 msgid "Cancelled..."
 msgstr "Avbrutt..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr "Kunne ikke legge til gassbytte"
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Kan ikke lese svar!"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Velg standard XML-fil"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Velg hvilke XML-filer du vil importere"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Lukk"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Fold sammen turer"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Feil med forbindelse"
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Lag ny tur"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "ft³"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Flaske"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Flaske"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Tank fra plan"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Flasker"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "D:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "ADVARSEL: DETTE ER EN NY IMPLEMENTASJON AV BÜHLMANN-ALGORITMEN OG EN DYKKEPLANLEGGER SOM IKKE HAR BLITT TESTET NOE SÆRLIG. VI ANBEFALER PÅ DET STERKESTE Å IKKE PLANLEGGE DYKK UTELUKKENDE MED DATA HERFRA."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr "Databaseforbindelse feiled '%s'.\n"
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr "Databasespørring feilen '%s'.\n"
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr "Databasespørring get_eventes feilet.\n"
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Dato"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Dato og tid"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Dato:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "des"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Standard XML-fil"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Slett informasjon om dykkecomputer"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Slett dykk"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Slett dykk"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Dybde"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Dybde (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Maksgrense for dybde overskredet"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Dybde:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Enhets-ID"
 
@@ -578,13 +602,18 @@ msgstr "Enhets-ID"
 msgid "Device or mount point"
 msgstr "Enhet eller disk"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr "Vis ugyldige dykk"
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Dykk #%1$d - %2$s %4$02d-%3$02d-%5$04d, %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Dykk #%1$d - %2$s %4$02d. %3$02d %5$04d %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Dykk #%d - "
@@ -594,23 +623,27 @@ msgstr "Dykk #%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Dykk #%d: %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Navn på dykkecomputer"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Informasjon"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Dykk"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Dykkeplan - DETTE ER KUN EN SIMULERING, IKKE BRUK TIL DYKKING"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr "Emneord"
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Starttid"
 
@@ -630,15 +663,15 @@ msgstr "Dykkecomputerleverandør og -modell"
 msgid "Dive data import error"
 msgstr "Feil ved import av dykkedata"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Dykkesteder"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Dykkeleder"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Når starter dykket?"
 
@@ -646,19 +679,19 @@ msgstr "Når starter dykket?"
 msgid "Dive#"
 msgstr "Dykk nr."
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Skrifttype for liste"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Dykkeleder"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Dykk"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Dykkesteder"
 
@@ -666,111 +699,123 @@ msgstr "Dykkesteder"
 msgid "Download From Dive Computer"
 msgstr "Last ned fra dykkecomputer"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Last ned fra dykkecomputer..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Last ned fra nettjeneste"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Last ned fra nettsted…"
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Ferdig å laste ned"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Varighet"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Varighet (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "Ø"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Rediger"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Rediger enhetsnavn"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Rediger navn for dykkecomputer"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Rediger turinformasjon"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Rediger tursammendrag"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Dobbeltklikk felter ved dobbeltklikke på dem"
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Rediger dykk"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Rediger dato og tid"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Rediger dykk"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Rediger flere dykk"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Rediger tursammendrag"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Skru på/av hendelser"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr "Vis / skjul emneord"
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Slutt"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Sluttdybde"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Skriv inn brukeridentifikator og trykk 'Last ned'. Trykk 'Bruk' når nedlastinga er ferdig hvis du vil lagre endringene."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Utstyr"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Feil ved lesing av salthetsgrad"
@@ -820,52 +865,64 @@ msgstr "Hendelse: systime%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Hendelse: Venter på bruker"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Fold ut turer"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr "Eksporter som UDDF"
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr "Eksporter UDDF..."
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr "Eksporter dykk til UDDF"
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Fikk ikke åpnet %i filer."
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Kunne ikke lese '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Kunne ikke lese '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Kunne ikke åpne '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Kunne ikke åpne '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "feb"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "fot"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Fil"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filter"
 
@@ -873,27 +930,27 @@ msgstr "Filter"
 msgid "Force download of all dives"
 msgstr "Tvungen nedlasting av alle dykk"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "fre"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh for plan"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow for plan"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (WGS84- eller GPS-format)"
 
@@ -902,42 +959,42 @@ msgstr "GPS (WGS84- eller GPS-format)"
 msgid "Gas Used"
 msgstr "Gass brukt"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Gassforbruk"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Gass"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Gasskonsum:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Gassmiks"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Generelle innstillinger"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Hjelp"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "Inaktiv"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Importer XML-fil(er)..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr "Importer fil(er)..."
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Info"
 
@@ -945,71 +1002,75 @@ msgstr "Info"
 msgid "Init Communication"
 msgstr "Start kommunikasjon"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Legg inn plan"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Ugyldig dybde - kunne ikke lese \"%s\""
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Ugyldig dybde - dykk dypere enn 400m støttes ikke"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Ugyldig gass i rad %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Ugyldig starttid"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Ugyldig brukeridentifikator!"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "jan"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "jul"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "jun"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr "Valg for utseende"
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel med flere, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Sted"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Logg"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Lengste"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Lengste dykk"
 
@@ -1021,14 +1082,26 @@ msgstr "Alarm: dårlig batteri"
 msgid "Low Battery Warning"
 msgstr "Advarsel: dårlig batteri"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Karttilbyder"
+
+#: main.c:77
 msgid "Mar"
 msgstr "mar"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr "Merk som ugyldig"
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Sett posisjon her"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr "Marker som gyldig"
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "markering"
@@ -1041,15 +1114,20 @@ msgstr "master"
 msgid "Max Deco Time Warning"
 msgstr "Advarsel: maks dekotid"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Maks. dybde"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Maksdybde (%s):"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Maks. SAC"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Maks. temp."
 
@@ -1059,115 +1137,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Maks. dybde: %.*f %s\n"
-"Tid: %d min\n"
-"%s"
+msgstr "Maks. dybde: %.*f %s\nTid: %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Maks CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Maks. trykk"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "mai"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Slå sammen dykk"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Slå samme tur med turen over"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Slå sammen tur med turen under"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Min. dybde"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Min. SAC"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min. temp"
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Ymse valg"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Modell"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "man"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Dykkelogg i C for flere plattformer"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Ny"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Nytt startnummer"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Neste DC"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Navn"
 
@@ -1175,11 +1250,24 @@ msgstr "Navn"
 msgid "No Tank Data"
 msgstr "Ingen tankinformasjon"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr "Dette dykket har ingen flasker."
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Notater"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr "Notathøyde (%d%% - %d%%)"
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr "Notater øverst"
+
+#: main.c:78
 msgid "Nov"
 msgstr "nov"
 
@@ -1187,12 +1275,12 @@ msgstr "nov"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "okt"
 
@@ -1200,18 +1288,31 @@ msgstr "okt"
 msgid "Odd pthread error return"
 msgstr "Feil ved retur fra pthread"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Er det greit å slette valgte oppføring?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr "Bare vis dykk med disse emneordene:"
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Åpne fil"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Åpne..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr "Sortering"
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr "Høyde på andre data (%d%% - %d%%)"
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1233,63 +1334,86 @@ msgstr "Advarsel: oppstigning /PO2"
 msgid "PO2 Green Warning"
 msgstr "Advarsel: grønn / PO2"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "psi"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr "Passord"
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Velg på kart"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Planlegger"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr "Legg inn brukerid og passord for divelogs.de. De valgte dykkene blir lastet opp."
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Valg"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Valg..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Trykk"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Trykk:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Forrige DC"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr "Fargeutskrift"
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Skriv ut valgte dykk"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Skriv ut valg"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Utskriftstype"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Profilinnstillinger"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr "Profilhøyde (%d%% - %d%%)"
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr "Profil øverst"
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -1301,7 +1425,7 @@ msgstr "Alarm: gjenværende gasstid"
 msgid "RGT Warning"
 msgstr "Advarsel: gjenværende gasstid"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Vurdering"
 
@@ -1310,23 +1434,31 @@ msgstr "Vurdering"
 msgid "Reading %s %s"
 msgstr "Leser %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr "Fjern"
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Fjern tur"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Fjern dykk fra tur"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr "Fjern hendelse her"
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Fjern valgte dykk fra tur"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Oppdater nummerering"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Oppdater nummerering..."
 
@@ -1334,20 +1466,21 @@ msgstr "Oppdater nummerering..."
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC under dekostopp"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "SAC under dykk"
 
@@ -1355,43 +1488,47 @@ msgstr "SAC under dykk"
 msgid "Safety Stop Violation"
 msgstr "Brudd på sikkerhetsstopp"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "lør"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Lagre endringer?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Lagre fil som"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Lagre som"
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Lagre..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Deltid"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Velg hendelser"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Velg hendelser…"
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr "Velg emneord..."
+
+#: main.c:78
 msgid "Sep"
 msgstr "sep"
 
@@ -1399,65 +1536,68 @@ msgstr "sep"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Fikk ikke skrevet ferdig req.txt\n"
-"Er Uemis Zurich plugget i ordentlig?"
+msgstr "Fikk ikke skrevet ferdig req.txt\nEr Uemis Zurich plugget i ordentlig?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Korteste"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Korteste dykk"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Vis kolonner"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Vis EAD, END, EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Vis MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Vis kalkulert tak"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Tak fra computer i rødt"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Vis i kart"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Vis graf for pHe"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Vis graf for pN%s"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Vis graf for pO%s"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Simulert dykk"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Størrelse"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: oppstigningshastighet"
@@ -1466,7 +1606,7 @@ msgstr "Alarm: oppstigningshastighet"
 msgid "Speed Warning"
 msgstr "Advarsel: oppstigningshastighet"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Start"
 
@@ -1474,59 +1614,63 @@ msgstr "Start"
 msgid "Start download"
 msgstr "Start nedlasting"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Statistikk %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Statistikk"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Status"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
-msgstr ""
+msgstr "Rar lesing av prosent %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Drakt"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "søn"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Overflateintervall"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Overflatetrykk (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Bytt gass til %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Tabellutskrift"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr "Emneord vises bare hvis de er identiske i alle redigerte dykk"
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Tankbytte foreslått"
@@ -1535,60 +1679,58 @@ msgstr "Tankbytte foreslått"
 msgid "Tank Pressure Info"
 msgstr "Info: tanktrykk"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Tek-innstillinger"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Alle"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "tor"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Tid"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Dobbeltklikk oppføring i lista\n"
-"for å redigere et dykk."
+msgstr "Dobbeltklikk oppføring i lista\nfor å redigere et dykk."
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Zoom av/på"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "For mange gassmikser"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "For mange rader"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Total tid"
 
@@ -1597,24 +1739,24 @@ msgstr "Total tid"
 msgid "Total Weight:"
 msgstr "Total vekt:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Tur %1$s. %3$d. %2$s %4$d (%5$d dykk)"
 msgstr[1] "Tur %1$s. %3$d. %2$s %4$d (%5$d dykk)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "tir"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Type"
 
@@ -1623,20 +1765,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: Filsystem er nesten fullt\n"
-"Koble fra og til dykkecomputeren og\n"
-"klikk 'Prøv igjen'"
+msgstr "Uemis Zurich: Filsystem er nesten fullt\nKoble fra og til dykkecomputeren og\nklikk 'Prøv igjen'"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: Fullt filsystem\n"
-"Koble fra og til dykkecomputeren\n"
-"og prøv igjen"
+msgstr "Uemis Zurich: Fullt filsystem\nKoble fra og til dykkecomputeren\nog prøv igjen"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1656,115 +1792,119 @@ msgstr "Kunne ikke lage parser for %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Fikk ikke åpnet %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Enheter"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr "Last opp dykk til divelogs.de"
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr "Last opp til divelogs.de"
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr "Last opp til divelogs.de..."
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Høyreklikk for å velge dykkested"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Brukeridentifikator"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
-msgstr ""
+msgstr "Brukermanual"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Vis"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Sikt"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Volum:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "V"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Advarsel - ekstremt lange dykk tar lang tid å prosessere"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Advarsel - svært dype dykk tar lang tid å prosessere"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Vanntemperatur"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Nettjeneste"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "ons"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Vekt"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Vektsystem"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Vekt:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML-fil"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "År"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Årsstatistikk"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Du har allerede en dykkecomputer med denne\n"
-"modellen ved navn %s\n"
-"Subsurface kan vedlikeholde et navn for denne computeren for å skille den fra en annen. Standarden er modell og enhets-ID som vist under.\n"
-"Hvis du ikke har lyst til å gi et navn til denne computeren, trykk 'Avbryt' og Subsurface vil vise modellen som navn.  Dette kan bety at du ikke ser forskjell på to like computere i loggen."
+msgstr "Du har allerede en dykkecomputer med denne\nmodellen ved navn %s\nSubsurface kan vedlikeholde et navn for denne computeren for å skille den fra en annen. Standarden er modell og enhets-ID som vist under.\nHvis du ikke har lyst til å gi et navn til denne computeren, trykk 'Avbryt' og Subsurface vil vise modellen som navn.  Dette kan bety at du ikke ser forskjell på to like computere i loggen."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Du har endringer som ikke er lagret.\n"
-"Vil du lagre disse før du lukker datafila?"
+msgstr "Du har endringer som ikke er lagret.\nVil du lagre disse før du lukker datafila?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Du har endringer som ikke er lagret i %s.\n"
-"Vil du lagre disse før du lukker fila?"
+msgstr "Du har endringer som ikke er lagret i %s.\nVil du lagre disse før du lukker fila?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "luft"
@@ -1773,7 +1913,11 @@ msgstr "luft"
 msgid "airtime"
 msgstr "lufttid"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr "høyde"
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "ankelvekt"
 
@@ -1781,22 +1925,34 @@ msgstr "ankelvekt"
 msgid "ascent"
 msgstr "oppstigning"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "p-vekt"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "vektbelte"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr "båt"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "bokmerke"
 
+#: statistics.c:21
+msgid "cave"
+msgstr "grotte"
+
+#: statistics.c:20
+msgid "cavern"
+msgstr "hule"
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "tak"
@@ -1805,11 +1961,11 @@ msgstr "tak"
 msgid "ceiling (safety stop)"
 msgstr "tak (sikkerhetsstopp)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "ft³"
 
@@ -1821,6 +1977,10 @@ msgstr "data"
 msgid "deco stop"
 msgstr "dekostopp"
 
+#: statistics.c:20
+msgid "deep"
+msgstr "dypdyk"
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "dypstopp"
@@ -1837,40 +1997,48 @@ msgstr "id for dykkesteddata"
 msgid "divetime"
 msgstr "dykketid"
 
+#: statistics.c:20
+msgid "drift"
+msgstr "strømdyk"
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "tørrdrakt"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "for alle dykk"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "for dykk #%d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "for dykk #"
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "for valgte dykk"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "for valgte dykk"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr "ferskvan"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1886,10 +2054,18 @@ msgstr "gassbytte"
 msgid "heading"
 msgstr "retning"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr "isdykk"
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integrert bly"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr "ugyldig"
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "ugyldig hendelsesnummer"
@@ -1898,15 +2074,19 @@ msgstr "ugyldig hendelsesnummer"
 msgid "jacket"
 msgstr "overdel"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr "innsjø"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "pund"
 
@@ -1914,15 +2094,15 @@ msgstr "pund"
 msgid "long john"
 msgstr "ermeløs våtdrakt"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "maks ppO₂"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "maks CNS"
 
@@ -1934,7 +2114,7 @@ msgstr "maksdybde"
 msgid "membrane"
 msgstr "skalldrakt"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "Min"
 
@@ -1947,11 +2127,15 @@ msgstr "modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "mer data dykke-id"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "mer enn %d dager"
 
+#: statistics.c:22
+msgid "night"
+msgstr "nattdykk"
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "tid uten stopp"
@@ -1960,25 +2144,33 @@ msgstr "tid uten stopp"
 msgid "none"
 msgstr "ingen"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "grense for pHe"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "grense for pN%s"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "grense for pO%s"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr "foto"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "basseng"
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1990,6 +2182,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr "elv"
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "sikkerhetsstopp"
@@ -2006,6 +2202,10 @@ msgstr "sikkerhetsstopp (frivillig)"
 msgid "semidry"
 msgstr "semidry"
 
+#: statistics.c:20
+msgid "shore"
+msgstr "landdykk"
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "shorty"
@@ -2014,12 +2214,21 @@ msgstr "shorty"
 msgid "surface"
 msgstr "overflate"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr "undervisning"
+
 #: libdivecomputer.c:154
 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:1075
+#: statistics.c:22
+msgid "training"
+msgstr "trening"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
 msgstr "Henrik Brautaset Aronsen"
 
@@ -2027,11 +2236,12 @@ msgstr "Henrik Brautaset Aronsen"
 msgid "transmitter"
 msgstr "sender"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "ukjent"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "ukjent"
 
@@ -2043,11 +2253,15 @@ msgstr "ikke spesifisert"
 msgid "vest"
 msgstr "vest"
 
+#: statistics.c:23
+msgid "video"
+msgstr "video"
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "brudd"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "Vekt"
 
@@ -2059,70 +2273,6 @@ msgstr "våtdrakt"
 msgid "workload"
 msgstr "arbeidsbelastning"
 
-#~ msgid "1 dive per page"
-#~ msgstr "1 dykk per side"
-
-#~ msgid "About"
-#~ msgstr "Om"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Grupper dykk som turer automatisk"
-
-#~ msgid "Delete"
-#~ msgstr "Slett"
-
-#, fuzzy
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Dybde\n"
-#~ "Gjennomsnitt"
-
-#~ msgid "Dive details"
-#~ msgstr "Detaljer"
-
-#, fuzzy
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Varighet\n"
-#~ "Total"
-
-#~ msgid "Pretty print"
-#~ msgstr "Pen utskrift"
-
-#, fuzzy
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "SAC\n"
-#~ "Gjennomsnitt"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "\n"
-#~ "Minimum"
-
-#, fuzzy
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Temperatur\n"
-#~ "Gjennomsnitt"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP-fil"
-
-#~ msgid "deco"
-#~ msgstr "deko"
+#: statistics.c:21
+msgid "wreck"
+msgstr "vrakdyk"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 827bc54d2..39a210865 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,38 +1,37 @@
-# Dutch translations for Subsurface package
-# Dutch messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Dirk Hohndel <dirk@hohndel.org>, 2012.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# dirkhh <dirk@hohndel.org>, 2012
 # Jacco van Koll <jacco.van.koll@gmail.com>, 2012
-#
+# rnt <reinout@xs4all.nl>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-26 10:07+0100\n"
-"Last-Translator: Reinout Hoornweg <reinout@xs4all.nl>\n"
-"Language-Team: Dutch\n"
-"Language: nl\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/subsurface/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Geen gebeurtenissen\n"
+msgstr "\nGeen gebeurtenissen\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Maand"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr "Download"
 
@@ -40,17 +39,17 @@ msgstr "Download"
 msgid " Please select dive computer and device. "
 msgstr " Selecteer duikcomputer en aansluiting. "
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr " begin"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr " eind"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "Nr."
 
@@ -64,52 +63,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %du %dmin"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%du %dmin"
@@ -119,185 +119,167 @@ msgstr "%du %dmin"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Berekend plafond %.0f %s"
+msgstr "%s\nBerekend plafond %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:%umin @ %.0f %s"
+msgstr "%s\nDeco:%umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:onbek.tijd @ %.0f %s"
+msgstr "%s\nDeco:onbek.tijd @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"In deco"
+msgstr "%s\nIn deco"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Veiligheidsstop:%umin @ %.0f %s"
+msgstr "%s\nVeiligheidsstop:%umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Veiligheidsstop:onbek.tijd @ %.0f %s"
+msgstr "%s\nVeiligheidsstop:onbek.tijd @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface duikplan\n"
-"Gebaseerd op GFlow =  %.0f en GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface duikplan\nGebaseerd op GFlow =  %.0f en GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
 msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
 
-#: dive.c:918
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) of (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(klik om datum/tijd te bewerken)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr ""
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(geen duiken)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(niets)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 cuft/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 cuft/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17L/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 duiken per bladzijde"
 
@@ -305,67 +287,78 @@ msgstr "2 duiken per bladzijde"
 msgid "2 pcs full suit"
 msgstr "2-delig pak"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20L/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "stappen van 3m voor berekend plafond"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 duiken per bladzijde"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
 msgstr ""
-"<small>Voeg etappes hieronder toe.\n"
-"Elke invoerregel beschrijft een deel van de geplande duik.\n"
-"Een invoerregel met diepte, tijd en gas beschrijft een etappe die eindigt op de gegeven diepte, de gegeven tijd duurt (indien relatief, bijv.  '+3:30') of eindigt op de gegeven tijd (indien absoluut) en gebruik maakt van het opgegeven gasmengsel.\n"
-"Een leeggelaten gasmengsel betekent 'gebruik vorig gasmengsel' (of AIR als geen gasmengsel opgegeven is).\n"
-"Een invoer die een diepte en een gas heeft, maar geen tijd, is speciaal: het vertelt de planner dat het opgegeven gasmengsel beschikbaar is voor de opstijging wanneer de opgegeven diepte is bereikt.\n"
-"CC Instelpunt specificeert CC (rebreather) duiken, dit veld wordt niet ingevuld voor OC.</small>\n"
 
-#: planner.c:1198
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "AIR"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "Over Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Duik toevoegen..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Duik Toevoegen"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Trip hierboven toevoegen"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Voeg routepunt toe."
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Luchtdruk"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Luchttemp."
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Luchttemp. in %s"
@@ -374,77 +367,86 @@ msgstr "Luchttemp. in %s"
 msgid "Always prefer downloaded dive"
 msgstr "Prefereer altijd de gedownloadde duik"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "apr"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "aug"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Automatisch groeperen"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Gem. diepte"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Gem. Diepte (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Gem. gasverbruik"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Gem. temp."
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Gem. tijd"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Schakel om naar OC"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Buddy"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC Instelpunt"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Kan gasmengsel %d/%d niet vinden"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Kan stylesheet (%s)/%s niet openen"
@@ -457,121 +459,143 @@ msgstr "GeÃ¤nnuleerd, zonder problemen afgesloten..."
 msgid "Cancelled..."
 msgstr "GeÃ¤nnuleerd..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Kan antwoord niet parsen!"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Kies standaard XML bestand"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 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:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Sluiten"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Alles inklappen"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Verbinding wordt opgezet."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Verbindingsfout:"
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Nieuwe trip hierboven invoegen"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Fles"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Fles"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Fles voor planning"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Flessen"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "D:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "NIET-AANSPRAKELIJKHEIDSVERKLARING / WAARSCHUWING: DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET BUHLMANN ALGORITME EN EEN IMPLEMENTATIE VAN EEN DUIKPLANNER DIE HIEROP GEBASEERD IS. BEIDE IMPLEMENTATIES HEBBEN MAAR EEN BEPERKTE MATE VAN TESTEN ONDERGAAN. WIJ RADEN MET KLEM AF DUIKEN UIT TE VOEREN DIE GEBASEERD ZIJN OP DE RESULTATEN DIE HIER GETOOND WORDEN."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Datum en tijd"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "dec"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Standaard XML bestand"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Verwijder duikcomputerinformatie"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Duik verwijderen"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Duiken verwijderen"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Diepte"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Diepte (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Dieptelimiet overschreden"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Diepte:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Apparaat-ID"
 
@@ -579,13 +603,18 @@ msgstr "Apparaat-ID"
 msgid "Device or mount point"
 msgstr "Device of mountpoint"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Duik nr. %1$d - %2$s %4$02d-%3$02d-%5$04d om %6$02d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr ""
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Duik nr. %d - "
@@ -595,23 +624,27 @@ msgstr "Duik nr. %d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Duik nr. %d: %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Duikcomputer naam"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Duikinformatie"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Duiknotities"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Duikplan - DIT IS ENKEL EEN SIMULATIE; NIET GEBRUIKEN VOOR EEN WERKELIJKE DUIK"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Duiktijd"
 
@@ -631,15 +664,15 @@ msgstr "Duikcomputer merk en model"
 msgid "Dive data import error"
 msgstr "Fout bij importeren van duikdata"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Duiklocaties"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Duikleider"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Wanneer begint de duik?"
 
@@ -647,19 +680,19 @@ msgstr "Wanneer begint de duik?"
 msgid "Dive#"
 msgstr "Duik nr."
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Duiklijst font"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Duikleider"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Duiken"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Duiklocaties"
 
@@ -667,111 +700,123 @@ msgstr "Duiklocaties"
 msgid "Download From Dive Computer"
 msgstr "Download uit duikcomputer"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Download uit duikcomputer..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Download van Webservice"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Download van Webservice..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Laden succesvol voltooid!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Duur"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Duur (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "O"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Bewerken"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Apparaatnamen bewerken"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Bewerk duikcomputer apparaatnamen"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Trip informatie bewerken"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Trip overzicht bewerken"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Bewerk een duikcomputernaam door te dubbelklikken in het relevante apparaatnaamveld."
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Duik bewerken"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Datum/tijd van duik bewerken"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Duiken bewerken"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Bewerk meerdere duiken"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Trip overzicht bewerken"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "In-/uitschakelen gebeurtenissen"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Einde"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Einddiepte"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Voer een gebruikers-ID in en klik op \"Download\". Wanneer de download voltooid is kunt u op \"Toepassen\" klikken als u de veranderingen wilt uitvoeren."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Uitrusting"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Fout bij het verkrijgen van het zoutgehalte"
@@ -821,52 +866,64 @@ msgstr "Event: systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Event: wachten op handeling van gebruiker"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Alles uitklappen"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Fout bij openen van  %i bestanden."
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Fout bij analyse van '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Fout bij analyseren van '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Fout bij lezen van '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Fout bij lezen van '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "feb"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "voet"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Bestand"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filter"
 
@@ -874,27 +931,27 @@ msgstr "Filter"
 msgid "Force download of all dives"
 msgstr "Forceer download van alle duiken"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Vr"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh voor plan"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow voor plan"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (WGS84 of GPS-formaat)"
 
@@ -903,42 +960,42 @@ msgstr "GPS (WGS84 of GPS-formaat)"
 msgid "Gas Used"
 msgstr "Gas verbruikt"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Gas verbruikt"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Gas gebruikt"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Gasverbruik:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Gasmengsel"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Algemene Instellingen"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Help"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "Inactief"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Importeer XML bestand(en)..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Informatie"
 
@@ -946,71 +1003,75 @@ msgstr "Informatie"
 msgid "Init Communication"
 msgstr "Initialiseer communicatie"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Voer plan in"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Ongeldige diepte: kan \"%s\" niet verwerken"
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Ongeldige diepte: dieptes groter dan 400m worden niet ondersteund"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Ongeldig gasmengsel voor regel %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Ongeldige starttijd"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Ongeldige gebruikersidentificatie"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "jan"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "jul"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "jun"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel en anderen, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Lijst"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Locatie"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Langste"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Langste duik"
 
@@ -1022,14 +1083,26 @@ msgstr "Alarm: Lege batterij"
 msgid "Low Battery Warning"
 msgstr "Waarschuwing:Lege batterij"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr ""
+
+#: main.c:77
 msgid "Mar"
 msgstr "mar"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Markeer locatie hier"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Markering"
@@ -1042,15 +1115,20 @@ msgstr "Master"
 msgid "Max Deco Time Warning"
 msgstr "Waarschuwing: Maximale deco-tijd"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Max. diepte"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Max. gasverbruik"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Max. temp."
 
@@ -1060,115 +1138,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Max. diepte: %.*f %s\n"
-"Duur: %d min\n"
-"%s"
+msgstr "Max. diepte: %.*f %s\nDuur: %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Max. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Max. druk"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Grootste"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Grootste"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Grootste"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "mei"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Duiken samenvoegen"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Trip met bovenstaande samenvoegen"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Trip met onderstaande samenvoegen"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Min. diepte"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Min. gasverbruik"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min. temp."
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Kleinste"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Kleinste"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Kleinste"
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Diverse opties"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Model"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Ma"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Multi-platform Duikprogramma in C"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Nieuw"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Nieuw beginnummer"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Volgende DC"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Apparaatnaam"
 
@@ -1176,11 +1251,24 @@ msgstr "Apparaatnaam"
 msgid "No Tank Data"
 msgstr "Geen flesinformatie"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Notities"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
 msgstr "nov"
 
@@ -1188,12 +1276,12 @@ msgstr "nov"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "okt"
 
@@ -1201,18 +1289,31 @@ msgstr "okt"
 msgid "Odd pthread error return"
 msgstr "Onbekende pthread foutmelding"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Geselecteerde gegevens wissen?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Bestand openen"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Openen..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1234,63 +1335,86 @@ msgstr "Waarschuwing: Opstijging / PO2"
 msgid "PO2 Green Warning"
 msgstr "Waarschuwing: PO2 Groen"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "psi"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Kies op kaart"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Planner"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Instellingen"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Instellingen..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Druk"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Druk:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Vorige DC"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Alleen geselecteerde duiken afdrukken"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Selectie afdrukken"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Afdruktype"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profiel"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Profiel"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -1302,7 +1426,7 @@ msgstr "Alarm: resterende gas-tijd"
 msgid "RGT Warning"
 msgstr "Waarschuwing: resterende gas-tijd"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Waardering"
 
@@ -1311,23 +1435,31 @@ msgstr "Waardering"
 msgid "Reading %s %s"
 msgstr "Lezen %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Trip verwijderen"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Duik uit trip verwijderen"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Geselecteerde duiken uit trip verwijderen"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Hernummeren"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Hernummeren..."
 
@@ -1335,20 +1467,21 @@ msgstr "Hernummeren..."
 msgid "Retry"
 msgstr "Opnieuw"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "Z"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "Gasverbruik"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "Gasverbruik tijdens decostop"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "Gasverbruik tijdens duik"
 
@@ -1356,43 +1489,47 @@ msgstr "Gasverbruik tijdens duik"
 msgid "Safety Stop Violation"
 msgstr "veiligheidsstop overtreding"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Za"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Aanpassingen opslaan?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Bestand opslaan als"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Opslaan als..."
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Opslaan..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Segment duur"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "gebeurtenissen selecteren"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "gebeurtenissen selecteren..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
 msgid "Sep"
 msgstr "sept"
 
@@ -1400,65 +1537,68 @@ msgstr "sept"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Gedeeltelijke schrijfvoortgang naar req.txt bestand\n"
-"Is de Uemis Zurich correkt aangesloten?"
+msgstr "Gedeeltelijke schrijfvoortgang naar req.txt bestand\nIs de Uemis Zurich correkt aangesloten?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Kortste"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Kortste duik"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Kolommen afbeelden"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Toon EAD, END en EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Toon MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Toon berekend plafond"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Toon door duikcomputer aangegeven plafond in rood"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Toon op kaart"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Toon pHe-grafiek"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Toon pN%s-grafiek"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Toon pO%s-grafiek"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Gesimuleerde duik"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Grootte"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: snelheid"
@@ -1467,7 +1607,7 @@ msgstr "Alarm: snelheid"
 msgid "Speed Warning"
 msgstr "Waarschuwing: snelheid"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Start"
 
@@ -1475,59 +1615,63 @@ msgstr "Start"
 msgid "Start download"
 msgstr "Begin download"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Statistieken %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Statistieken"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Status"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Vreemde percentage %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Pak"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "Zo"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Oppervlaktetijd"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Luchtdruk (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Gaswissel naar %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Afdrukken in tabelvorm"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Fleswissel voorgesteld"
@@ -1536,60 +1680,58 @@ msgstr "Fleswissel voorgesteld"
 msgid "Tank Pressure Info"
 msgstr "Info: Flesdruk"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Tec instellingen"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temperatuur"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatuur"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatuur:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Drie"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Do"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Tijd"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Om duikinformatie te bewerken\n"
-"dubbelklik op de duik in de duiklijst"
+msgstr "Om duikinformatie te bewerken\ndubbelklik op de duik in de duiklijst"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Zoom in-/uitschakelen"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Teveel gasmengsels"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Teveel routepunten"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Totale"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Totale tijd"
 
@@ -1598,24 +1740,24 @@ msgstr "Totale tijd"
 msgid "Total Weight:"
 msgstr "Totaal gewicht:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Trip %1$s %3$d %2$s %4$d (%5$d duik)"
 msgstr[1] "Trip %1$s %3$d %2$s %4$d (%5$d duiken)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Di"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Type"
 
@@ -1624,20 +1766,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: Bestandssysteem bijna vol\n"
-"AUB de duikcomputer loskoppelen en weer aansluiten\n"
-"en klik op 'Opnieuw'"
+msgstr "Uemis Zurich: Bestandssysteem bijna vol\nAUB de duikcomputer loskoppelen en weer aansluiten\nen klik op 'Opnieuw'"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: Bestandssysteem vol\n"
-"AUB de duikcomputer loskoppellen en weer aansluiten\n"
-"en probeer opnieuw"
+msgstr "Uemis Zurich: Bestandssysteem vol\nAUB de duikcomputer loskoppellen en weer aansluiten\nen probeer opnieuw"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1657,114 +1793,119 @@ msgstr "Kan geen parser creëren voor %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Fout bij openen van  %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Eenheden"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Gebruik de rechtermuisknop om een duiklocatie te markeren"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Gebruikersidentificatie"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Gebruikershandleiding"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Weergave"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Zicht"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Volume:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "W"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Waarschuwing: bijzonder lange duiken kunnen lange berekentijd kosten"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Waarschuwing: het plannen van extreem diepe duiken kan bijzonder veel tijd kosten"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Watertemp."
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Webservice"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Wo"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Gewicht"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Gewichtssysteem"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML bestand"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Jaar"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Jaarlijkse statistieken"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"U heeft al een duikcomputer van dit model met naam %s\n"
-"Subsurface kan een bijnaam  voor dit apparaat gebruiken zodat het onderscheiden kan worden van de reeds bestaande. De standaardnaam is het model en het apparaat ID zoals hieronder getoond.\n"
-"Als u geen bijnaam voor deze duikcomputer wilt gebruiken, klik dan op \"Annuleren\" en Subsurface zal dan het model als de naam gebruiken (wat kan betekenen dat u de twee duikcomputers niet van elkaar kunt onderscheiden in het logboek)."
+msgstr "U heeft al een duikcomputer van dit model met naam %s\nSubsurface kan een bijnaam  voor dit apparaat gebruiken zodat het onderscheiden kan worden van de reeds bestaande. De standaardnaam is het model en het apparaat ID zoals hieronder getoond.\nAls u geen bijnaam voor deze duikcomputer wilt gebruiken, klik dan op \"Annuleren\" en Subsurface zal dan het model als de naam gebruiken (wat kan betekenen dat u de twee duikcomputers niet van elkaar kunt onderscheiden in het logboek)."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"U heeft onopgeslagen wijzigingen.\n"
-"Wilt u deze opslaan voordat u het databestand afsluit?"
+msgstr "U heeft onopgeslagen wijzigingen.\nWilt u deze opslaan voordat u het databestand afsluit?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"U heeft onopgeslagen wijzigingen in bestand: %s \n"
-"Wilt u deze opslaan voordat u het databestand afsluit?"
+msgstr "U heeft onopgeslagen wijzigingen in bestand: %s \nWilt u deze opslaan voordat u het databestand afsluit?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "lucht"
@@ -1773,7 +1914,11 @@ msgstr "lucht"
 msgid "airtime"
 msgstr "resterende luchttijd"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "enkel"
 
@@ -1781,22 +1926,34 @@ msgstr "enkel"
 msgid "ascent"
 msgstr "opstijging"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "backplate-gewicht"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "riem"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "bladwijzer"
 
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "plafond"
@@ -1805,11 +1962,11 @@ msgstr "plafond"
 msgid "ceiling (safety stop)"
 msgstr "plafond (veiligheidsstop)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "cuft"
 
@@ -1821,6 +1978,10 @@ msgstr "gegevens"
 msgid "deco stop"
 msgstr "decompressiestop"
 
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "diepe stop"
@@ -1837,40 +1998,48 @@ msgstr "Duiklocatie data ID"
 msgid "divetime"
 msgstr "duiktijd"
 
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "droogpak"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "EAN"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "voor alle duiken"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "Voor duik nr. %d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "voor duik nr."
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "voor de geselecteerde duik"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "voor de geselecteerde duiken"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1886,10 +2055,18 @@ msgstr "gaswissel"
 msgid "heading"
 msgstr "koers"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "Geïntegreerd"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "ongeldig event-nummer"
@@ -1898,15 +2075,19 @@ msgstr "ongeldig event-nummer"
 msgid "jacket"
 msgstr "jack"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "US pond"
 
@@ -1914,15 +2095,15 @@ msgstr "US pond"
 msgid "long john"
 msgstr "long john"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "max. pp02"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "max. CNS"
 
@@ -1934,7 +2115,7 @@ msgstr "Max. diepte"
 msgid "membrane"
 msgstr "membraan droogpak"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1947,11 +2128,15 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "meer data voor duik ID"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "meer dan %d dagen"
 
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "nultijd"
@@ -1960,25 +2145,33 @@ msgstr "nultijd"
 msgid "none"
 msgstr "geen"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "pHe grenswaarde"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "pN%s grenswaarde"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "pO%s grenswaarde"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "Pa"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1990,6 +2183,10 @@ msgstr "RBT"
 msgid "rgbm"
 msgstr "RGBM"
 
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "veiligheidsstop"
@@ -2006,6 +2203,10 @@ msgstr "veiligheidsstop (vrijwillig)"
 msgid "semidry"
 msgstr "semidroog"
 
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "shorty"
@@ -2014,26 +2215,34 @@ msgstr "shorty"
 msgid "surface"
 msgstr "oppervlakte"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "waarschuwing stikstofbelasting"
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1075
-msgid "translator-credits"
+#: statistics.c:22
+msgid "training"
 msgstr ""
-"Jacco van Koll\n"
-"Reinout Hoornweg"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
+msgid "translator-credits"
+msgstr "Jacco van Koll\nReinout Hoornweg"
 
 #: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "zender"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "onbek"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "onbekend"
 
@@ -2045,11 +2254,15 @@ msgstr "Niet gespecificeerd"
 msgid "vest"
 msgstr "vest"
 
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "schending"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "Gewicht"
 
@@ -2061,67 +2274,6 @@ msgstr "natpak"
 msgid "workload"
 msgstr "werklast"
 
-#~ msgid "1 dive per page"
-#~ msgstr "1 duik per bladzijde"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Automatisch de duiken in trips groeperen"
-
-#~ msgid "Delete"
-#~ msgstr "Verwijderen"
-
-#, fuzzy
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Diepte\n"
-#~ "Gemiddeld"
-
-#~ msgid "Dive details"
-#~ msgstr "Duikdetails"
-
-#, fuzzy
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Duur\n"
-#~ "Totaal"
-
-#~ msgid "Pretty print"
-#~ msgstr "Mooi afdrukken"
-
-#, fuzzy
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Gas verbruiksratio\n"
-#~ "Gemiddeld"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "\n"
-#~ "Kleinste"
-
-#, fuzzy
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Temperatuur\n"
-#~ "Gemiddeld"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP bestand"
-
-#~ msgid "deco"
-#~ msgstr "deco"
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 9d2ca9874..e11fb0677 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -1,39 +1,36 @@
-# Polish translations for Subsurface package
-# Polish messages for Subsurface.
-# Copyright (C) 2013 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Krzysztof Arentowicz <k.arentowicz@gmail.com>, 2013.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# karent <karent.bug@gmail.com>, 2013
+# Krzysztof Arentowicz <k.arentowicz@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-16 23:48+0100\n"
-"Last-Translator: Krzysztof Arentowicz <k.arentowicz@gmail.com>\n"
-"Language-Team: Polish\n"
-"Language: pl\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/subsurface/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-KeywordsList: _;gettext;gettext_noop;N_;C_\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: POLAND\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SearchPath-0: ..\n"
-
-#: gtk-gui.c:973
+"Language: pl_PL\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
+msgstr "\nbrak znaczników\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > miesiąc"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr "Pobierz"
 
@@ -41,17 +38,17 @@ msgstr "Pobierz"
 msgid " Please select dive computer and device. "
 msgstr "Proszę wybrać komputer nurkowy i urządzenie"
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr " początek"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr " koniec"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "#"
 
@@ -65,52 +62,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s z %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %dh %dmin"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
@@ -120,185 +118,167 @@ msgstr "%dh %dmin"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Obliczony sufit %.0f %s"
+msgstr "%s\nObliczony sufit %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:%umin @ %.0f %s"
+msgstr "%s\nDeco:%umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:nieznany czas @ %.0f %s"
+msgstr "%s\nDeco:nieznany czas @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"dekompresja"
+msgstr "%s\ndekompresja"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Przyst. bezp.:%umin @ %.0f %s"
+msgstr "%s\nPrzyst. bezp.:%umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Przyst. bezp.:nieznany czas @ %.0f %s"
+msgstr "%s\nPrzyst. bezp.:nieznany czas @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface - Plan Nurkownia\n"
-"w oparciu o GFlow = %.0f oraz GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface - Plan Nurkownia\nw oparciu o GFlow = %.0f oraz GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
 msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
 
-#: dive.c:918
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) lub (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(kliknij by edytować datę/czas)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(kliknij by edytować datę/czas/głębokość)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(brak nurkowań)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(nic)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 cuft/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 cuft/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 nurkowania na stronę"
 
@@ -306,67 +286,78 @@ msgstr "2 nurkowania na stronę"
 msgid "2 pcs full suit"
 msgstr "pełna dwuczęściowa"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "Pokazuj sufit z krokiem co 3m"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 nurkowań na stronę"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
 msgstr ""
-"<small>Dodaj segmenty nurkowania poniżej.\n"
-"Każda linia opisuje segment planowanego nurkowania.\n"
-"Wpis z podaniem głębokości, czasu i rodzaju gazu oznacza fragment nurkowania kończący się na danej głębokości, trwający dany czas (gdy czas podano względem poprzedniego, np '+3:30') lub kończący o podanym czasie (zapis bezwzględny) z użyciem określonego gazu.\n"
-"Jeśli nie podasz rodzaju gazu dla danego segmentu oznacza to użycie tego samego rodzaju gazu, co w poprzednim segmencie  (jeśli w ogóle nie określisz gazu, domyślnie przyjmowane jest powietrze).\n"
-"Wpis z podaniem głębokości i rodzaju gazu ale bez podania czasu ma specjalne znaczenie - informuje to Planer, że dany gaz jest dostępny podczas wynurzania po osiągnięciu danej głębokości.\n"
-"CC SetPoint dotyczy nurkowań na obiegu zamkniętym (rebreather) - pole należy pozostawić puste dla nurkowania na obiegu otwartym</small>\n"
-
-#: planner.c:1198
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "POWIETRZE"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "O Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Dodaj nurkowanie..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Dodaj nurkowanie"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Dodaj do grupy powyżej"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Dodaj punkt"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Ciśnienie atm."
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Temp. powietrza"
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Temperatura powietrza w %s"
@@ -375,80 +366,89 @@ msgstr "Temperatura powietrza w %s"
 msgid "Always prefer downloaded dive"
 msgstr "Preferuj pobierane nurkowania"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Kwi"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Sie"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Automatyczne grupowanie"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "średnia"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "średni"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "średni"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "średnia"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Śr. głębokość "
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Śr. głębokość  (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Śr. SAC"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Śr. temp."
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Średni czas"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Przejście na obieg otwarty"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "Bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Partner"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC SetPoint"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Nie znaleziono gazu %d/%d"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
-msgstr ""
+msgstr "Nie można otworzyć arkusza stylów (%s)/%s"
 
 #: uemis-downloader.c:932
 msgid "Cancelled, exiting cleanly..."
@@ -458,121 +458,143 @@ msgstr "Anulowano"
 msgid "Cancelled..."
 msgstr "Anulowano..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Nie można przetworzyć odpowiedzi!"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsjusz"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Wybierz domyślmy plik XML"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Wybierz plik XML, z którego zaimportować dane"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Zamknij"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Zwiń wszystkie"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Błąd połączenia:"
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Utwórz nową grupę powyżej"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Butle"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Butla"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "butle do zaplanowania"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Butle"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "Gł:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "OSTRZEŻENIE: TEN PLANER POSŁUGUJE SIĘ IMPLEMENTACJĄ ALGORYTMU BUHLMANNA, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Data"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Data i czas"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Data:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Gru"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Domyślny plik XML"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Usuń informacje o komputerze nurkowym"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Usuń nurkowanie"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Usuń nurkowania"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Głębokość"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Głębokość (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Przekroczenie limitu głębokości"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Głębokość:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Id urządzenia"
 
@@ -580,13 +602,18 @@ msgstr "Id urządzenia"
 msgid "Device or mount point"
 msgstr "Urządzenie lub punkt montowania"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Nurkowanie nr %1$d - %2$s %3$02d/%4$02d/%5$04d o %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Nurkowanie #%1$d - %2$s %3$02d/%4$02d/%5$04d o %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Nurkowanie nr %d - "
@@ -596,23 +623,27 @@ msgstr "Nurkowanie nr %d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Nurkowanie %d: %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Nazwa komputera nurkowego"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Informacje"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Notatki"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Plan nurkowania - SYMULACJA; NIE UŻYWAĆ DO  NURKOWANIA."
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Czas nurkowania"
 
@@ -632,15 +663,15 @@ msgstr "Producent i model komputera nurkowego"
 msgid "Dive data import error"
 msgstr "Błąd podczas importowania danych"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Miejsca nurkowe"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Divemaster"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Początek nurkowania za:"
 
@@ -648,19 +679,19 @@ msgstr "Początek nurkowania za:"
 msgid "Dive#"
 msgstr "Nurkowanie nr"
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Czcionka listy nurkowań"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Nurkowania"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Miejsca nurkowe"
 
@@ -668,111 +699,123 @@ msgstr "Miejsca nurkowe"
 msgid "Download From Dive Computer"
 msgstr "Pobierz z komputera nurkowego"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Pobierz z komputera nurkowego"
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Pobierz z Web Service"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Pobierz z Web Service"
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Pobieranie zakończone sukcesem!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Czas"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Czas trwania(min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "E"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Edytuj"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Edycja nazw komputerów nurkowych"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Edycja nazw komputerów nurkowych"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Edytuj informacje o grupie"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Edytuj podsumowanie grupy nurkowań"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Aby edytować nazwę komputera nurkowego kliknij dwukrotnie odpowiednie pole z nazwą"
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Edytuj nurkowanie"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Edytuj datę/czas nurkowania"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Edycja wielu nurkowań"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Edycja wielu nurkowań"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Edytuj podsumowanie grupy nurkowań"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Pokazuj znaczniki dla:"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Koniec"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Głębokość końcowa"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Podaj identyfikator użytkownika i wybierz 'Pobierz'. Po zakończeniu pobierania możesz wybrać 'Zastosuj' w celu zastosowania zmian."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Wyposażenie"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Błąd podczas przetwarzania danych o zasoleniu"
@@ -822,52 +865,64 @@ msgstr "Event: systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Oczekiwanie na działanie użytkownika"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Rozwiń wszystkie"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Nie udało się otworzyć %i plików."
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Nie udało się przetworzyć '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Nie udało się przetworzyć '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Błąd odczytu '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Błąd odczytu '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Lut"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Stopy"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Plik"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filtr"
 
@@ -875,27 +930,27 @@ msgstr "Filtr"
 msgid "Force download of all dives"
 msgstr "Wymuś pobranie wszystkich nurkowań"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Pią"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh dla planu"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow dla planu"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (format WGS84 lub GPS)"
 
@@ -904,42 +959,42 @@ msgstr "GPS (format WGS84 lub GPS)"
 msgid "Gas Used"
 msgstr "Użyty gaz"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Zużyty gaz"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Użyty gaz"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Zużycie gazu:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Gaz"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Ogólne"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Pomoc"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "Bezczynny"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Importuj plik(i) XML File..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Informacje"
 
@@ -947,71 +1002,75 @@ msgstr "Informacje"
 msgid "Init Communication"
 msgstr "Nawiązywanie łączności"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Wprowadź plan"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Niepoprawna głębokość - nie można zinterpretować \"%s\""
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Niepoprawna głębokość - głębokości poniżej 400m nie są obsługiwane"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Niepoprawny gaz w linijce %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Niepoprawny czas początku nurkowania"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Niepoprawny identyfikator użytkownika!"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Sty"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Lip"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Cze"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel i inni, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Lista"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Litry"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Miejsce"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "max."
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Najdłuższe nurkowanie"
 
@@ -1023,14 +1082,26 @@ msgstr "Alarm: niski poziom baterii"
 msgid "Low Battery Warning"
 msgstr "Ostrzeżenie: niski poziom baterii"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Źródło map"
+
+#: main.c:77
 msgid "Mar"
 msgstr "Mar"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Zaznacz położenie"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Znacznik"
@@ -1043,15 +1114,20 @@ msgstr "Divemaster"
 msgid "Max Deco Time Warning"
 msgstr "Ostrzeżenie: maksymalny czas dekompresji"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Max głębokość "
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Max głębokość  (%s):"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Max SAC"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Max temp."
 
@@ -1061,115 +1137,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Max głębokość : %.*f %s\n"
-"Czas: %d min\n"
-"%s"
+msgstr "Max głębokość : %.*f %s\nCzas: %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Max. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Ciśnienie max"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "max."
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "max."
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "max."
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Maj"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Połącz nurkowania"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Połącz grupę z grupą powyżej"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Połącz grupę z grupą poniżej"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Metry"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Min głębokość "
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Min SAC"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min temp."
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "min."
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "min."
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "min."
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Różne"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Model"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Pon"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Wieloplatformowy log nurkowy napisany w C"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Nowy"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Nowy numer początkowy"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Następny komputer"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Nazwa"
 
@@ -1177,11 +1250,24 @@ msgstr "Nazwa"
 msgid "No Tank Data"
 msgstr "Brak danych o butli"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Notatki"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
 msgstr "Lis"
 
@@ -1189,12 +1275,12 @@ msgstr "Lis"
 msgid "OLF"
 msgstr "Ekspozycja tlenowa"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Paź"
 
@@ -1202,18 +1288,31 @@ msgstr "Paź"
 msgid "Odd pthread error return"
 msgstr "Błąd pthread"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Na pewno usunąć zaznaczony wpis?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Otwórz plik"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Otwórz..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1235,63 +1334,86 @@ msgstr "Ostrzeżenie: wynurzanie / PO2"
 msgid "PO2 Green Warning"
 msgstr "Ostrzeżenie: PO2 zielone"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "PSI"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Wskaż na mapie"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Planowanie"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Ustawienia..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Ciśnienie"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Ciśnienie:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Poprzedni komputer"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Drukuj tylko zaznaczone nurkowania"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Wybór danych do druku"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Rodzaj wydruku"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Drukuj..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Konfiguracja profilu"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Wyjście"
 
@@ -1303,7 +1425,7 @@ msgstr "Alarm: ilość gazu"
 msgid "RGT Warning"
 msgstr "Ostrzeżenie: ilość gazu"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Ocena"
 
@@ -1312,23 +1434,31 @@ msgstr "Ocena"
 msgid "Reading %s %s"
 msgstr "Czytanie %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Usuń grupę"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Usuń nurkowanie z grupy"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Usuń wybrane nurkowania z grupy"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Zmień numerację"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Zmień numerację..."
 
@@ -1336,20 +1466,21 @@ msgstr "Zmień numerację..."
 msgid "Retry"
 msgstr "Ponów"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC podczas dekompresji"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "SAC podczas nurkowania"
 
@@ -1357,43 +1488,47 @@ msgstr "SAC podczas nurkowania"
 msgid "Safety Stop Violation"
 msgstr "Pominięcie przystanku bezpieczeństwa"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Sob"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Zapisz jako.."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Zapisać zmiany?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Zapisz jako"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Zapisz jako"
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Zapisz..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Czas segmentu"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Wybór znaczników"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Wybór znaczników..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
 msgid "Sep"
 msgstr "Wrz"
 
@@ -1401,65 +1536,68 @@ msgstr "Wrz"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Nieudany zapis do pliku req.txt \n"
-"Czy Uemis Zurich jest podłączony poprawnie?"
+msgstr "Nieudany zapis do pliku req.txt \nCzy Uemis Zurich jest podłączony poprawnie?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "min."
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Najkrótsze nurkowanie"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Pokazuj kolumny"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "pokazuj EAD, END, EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "pokazuj MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Pokazuj obliczony sufit"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Pokazuj sufit z komputera nurkowego na czerwono"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Pokaż na mapie"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "pokazuj wykres pHe"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "pokazuj wykres pN%s"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "pokazuj wykres pO%s"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Symulowane nurkowanie"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Pojemność"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm prędkości wynurzania"
@@ -1468,7 +1606,7 @@ msgstr "Alarm prędkości wynurzania"
 msgid "Speed Warning"
 msgstr "Ostrzeżenie: prędkość wynurzania"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Start"
 
@@ -1476,59 +1614,63 @@ msgstr "Start"
 msgid "Start download"
 msgstr "Rozpocznij pobieranie"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Statystyka"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Statystyka %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Statystyka"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Status"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
-msgstr ""
+msgstr "Podejrzany skład procentowy %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Skafander"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "Nie"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Przerwa pow."
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Ciśnienie atmosferyczne (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Zmiana gazu na %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Tabela"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Zalecana zmiana gazu"
@@ -1537,60 +1679,58 @@ msgstr "Zalecana zmiana gazu"
 msgid "Tank Pressure Info"
 msgstr "Ciśnienie w butli"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Ustawienia Tec"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temperatura"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Potrójny"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Czw"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Czas"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Aby edytować informacje o nurkowaniu\n"
-"dwukrotnie kliknij na jego wpisie na liście nurkowań"
+msgstr "Aby edytować informacje o nurkowaniu\ndwukrotnie kliknij na jego wpisie na liście nurkowań"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Skalowanie wykresu"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Zbyt wiele rodzajów gazu"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Zbyt wiele punktów"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "całkowity"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Całkowity czas"
 
@@ -1599,24 +1739,25 @@ msgstr "Całkowity czas"
 msgid "Total Weight:"
 msgstr "Całkowity balast:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Przejście do  %.*f %s w %d:%02d min - runtime %d:%02u z %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
-msgstr[0] "Grupa %1$s, %3$d. %2$s %4$d (%5$d nurkowanie)"
-msgstr[1] "Grupa %1$s, %3$d. %2$s %4$d (nurkowań: %5$d)"
+msgstr[0] "Grupa %1$s, %2$s %3$d, %4$d (%5$d nurkowanie)"
+msgstr[1] "Grupa %1$s, %2$s %3$d, %4$d (%5$d nurkowania)"
+msgstr[2] "Grupa %1$s, %2$s %3$d, %4$d (%5$d nurkowań)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Wto"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Rodzaj"
 
@@ -1625,20 +1766,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: System plików jest prawie pełen\n"
-"Odłącz i podłącz ponownie komputer nurkowy \n"
-"i wybierz 'Ponów'"
+msgstr "Uemis Zurich: System plików jest prawie pełen\nOdłącz i podłącz ponownie komputer nurkowy \ni wybierz 'Ponów'"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: System plików jest pełen\n"
-"Odłącz i podłącz ponownie komputer nurkowy\n"
-"i spróbuj jeszcze raz."
+msgstr "Uemis Zurich: System plików jest pełen\nOdłącz i podłącz ponownie komputer nurkowy\ni spróbuj jeszcze raz."
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1658,115 +1793,119 @@ msgstr "Nie udało się utworzyć parsera dla %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Nie udało się otworzyć %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Jednostki"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Kliknij prawym przyciskiem, by zaznaczyć miejsce nurkowania"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Identyfikator użytkownika"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
-msgstr ""
+msgstr "instrukcja obsługi"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Widok"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Widoczność"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Objętość:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "W"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Ostrzeżenie - ekstremalnie długie nurkowanie może spowodować znaczne wydłużenie czasu obliczeń"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Ostrzeżenie - planowanie bardzo głębokich nurkowań może spowodować znaczne wydłużenie czasu obliczeń"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Temp. wody"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Webservice"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Śro"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Balast"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Rodzaj balastu"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Waga:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "plik XML"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Rok"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Statystyka roczna"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Istnieje już zdefiniowany komputer nurkowy tego typu\n"
-"nazwany  %s\n"
-"Subsurface może nadać nazwę temu urządzeniu, która pozwoli go odróżnić od już istniejącego. Domyślna nazwa to model i ID pokazane poniżej.\n"
-"Jeśli nie chcesz podawać własnej nazwy wybierz 'Anuluj' a Subsurface będzie używać modelu jako nazwy (może to oznaczać, że w logach nie da się odróżnić obu komputerów od siebie)."
+msgstr "Istnieje już zdefiniowany komputer nurkowy tego typu\nnazwany  %s\nSubsurface może nadać nazwę temu urządzeniu, która pozwoli go odróżnić od już istniejącego. Domyślna nazwa to model i ID pokazane poniżej.\nJeśli nie chcesz podawać własnej nazwy wybierz 'Anuluj' a Subsurface będzie używać modelu jako nazwy (może to oznaczać, że w logach nie da się odróżnić obu komputerów od siebie)."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Istnieją niezapisane zmiany \n"
-"Czy chcesz zapisać zmiany przed zamknięciem pliku?"
+msgstr "Istnieją niezapisane zmiany \nCzy chcesz zapisać zmiany przed zamknięciem pliku?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Istnieją niezapisane zmiany w pliku %s\n"
-"Czy chcesz zapisać te zmiany przed zamknięciem pliku?"
+msgstr "Istnieją niezapisane zmiany w pliku %s\nCzy chcesz zapisać te zmiany przed zamknięciem pliku?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "powietrze"
@@ -1775,7 +1914,11 @@ msgstr "powietrze"
 msgid "airtime"
 msgstr "Pozostały czas oddychania"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "na kostkach"
 
@@ -1783,22 +1926,34 @@ msgstr "na kostkach"
 msgid "ascent"
 msgstr "wynurzanie"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "na płycie"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "pas balastowy"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "znacznik"
 
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "sufit"
@@ -1807,11 +1962,11 @@ msgstr "sufit"
 msgid "ceiling (safety stop)"
 msgstr "sufit (przystanek bezpieczeństwa)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "doczepiany"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "cuft"
 
@@ -1823,6 +1978,10 @@ msgstr "dane"
 msgid "deco stop"
 msgstr "przystanek deco"
 
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "deepstop"
@@ -1839,40 +1998,48 @@ msgstr "dane o miejscu nurkowania id"
 msgid "divetime"
 msgstr "czas nurkowania"
 
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "suchy"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "dla wszystkich nurkowań"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "dla nurkowania #%d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "dla nurkowania nr"
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "dla wybranego nurkowania"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "dla wybranych nurkowań"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1888,10 +2055,18 @@ msgstr "zmiana gazu"
 msgid "heading"
 msgstr "kierunek"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "zintegrowany"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "niepoprawny znacznik"
@@ -1900,15 +2075,19 @@ msgstr "niepoprawny znacznik"
 msgid "jacket"
 msgstr "kurtka"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "lbs"
 
@@ -1916,15 +2095,15 @@ msgstr "lbs"
 msgid "long john"
 msgstr "długi"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "max ppO2"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "maxCNS"
 
@@ -1936,7 +2115,7 @@ msgstr "Max głębokość"
 msgid "membrane"
 msgstr "membranowy"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1949,11 +2128,15 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "dane nurkowania id"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "więcej niż %d dni"
 
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "czas bezdekompresyjny"
@@ -1962,25 +2145,33 @@ msgstr "czas bezdekompresyjny"
 msgid "none"
 msgstr "brak"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "próg pHe"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "próg pN%s"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "próg pO%s "
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1992,6 +2183,10 @@ msgstr "pozostały czas na dnie"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "przystanek bezpieczeństwa"
@@ -2008,6 +2203,10 @@ msgstr "przystanek bezpieczeństwa (opcjonalny)"
 msgid "semidry"
 msgstr "półsuchy"
 
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "krótki"
@@ -2016,12 +2215,21 @@ msgstr "krótki"
 msgid "surface"
 msgstr "powierzchnia"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Ostrzeżenie: poziom nasycenia tkanek"
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1075
+#: statistics.c:22
+msgid "training"
+msgstr ""
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
 msgstr "Krzysztof Arentowicz"
 
@@ -2029,11 +2237,12 @@ msgstr "Krzysztof Arentowicz"
 msgid "transmitter"
 msgstr "nadajnik"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "nie podano"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "nieznana"
 
@@ -2045,11 +2254,15 @@ msgstr "nieokreślony"
 msgid "vest"
 msgstr "kamizelka"
 
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "naruszenie"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "waga"
 
@@ -2061,11 +2274,6 @@ msgstr "mokry"
 msgid "workload"
 msgstr "wysiłek"
 
-#~ msgid "Dive details"
-#~ msgstr "Szczegóły"
-
-#~ msgid "Type of"
-#~ msgstr "Rodzaj"
-
-#~ msgid "ZIP file"
-#~ msgstr "plik ZIP"
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/pt_BR.aliases b/po/pt_BR.aliases
new file mode 100644
index 000000000..b9a724f7c
--- /dev/null
+++ b/po/pt_BR.aliases
@@ -0,0 +1 @@
+br
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 000000000..c605439eb
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,2277 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Rodrigo Padula <contato@rodrigopadula.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: subsurface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/subsurface/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: gtk-gui.c:1190
+msgid ""
+"\n"
+"No Events\n"
+msgstr ""
+
+#: statistics-gtk.c:94
+msgctxt "Stats"
+msgid " > Month"
+msgstr "> Mês"
+
+#: webservice.c:289
+msgid " Download"
+msgstr "Download"
+
+#: download-dialog.c:374
+msgid " Please select dive computer and device. "
+msgstr "Por favor, selecione o seu dispositivo e computador de mergulho."
+
+#: profile.c:429
+msgctxt "Starts with space!"
+msgid " begin"
+msgstr "início"
+
+#: profile.c:430
+msgctxt "Starts with space!"
+msgid " end"
+msgstr "fim"
+
+#: statistics-gtk.c:92
+msgid "#"
+msgstr "#"
+
+#: print.c:267 print.c:326
+#, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s"
+
+#: print.c:344
+#, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s\n"
+
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
+#, c-format
+msgid "%.*f %s/min"
+msgstr "%.*f %s/min"
+
+#: planner.c:581
+#, c-format
+msgid "%.0f%s of %s\n"
+msgstr "%.0f%s de %s\n"
+
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
+#: print.c:88
+#, c-format
+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:566
+#, 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:569
+#, 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-gtk.c:349
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr ""
+
+#: print.c:582 statistics-gtk.c:356
+#, c-format
+msgid "%d min"
+msgstr "%d min"
+
+#: statistics.c:204
+#, c-format
+msgid "%dd %dh %dmin"
+msgstr "%dd %dh %dmin"
+
+#: statistics.c:206
+#, c-format
+msgid "%dh %dmin"
+msgstr "%dh %dmin"
+
+#: print.c:322
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2191
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2159
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2175
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2178
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr "%s\nDeco:tempo desconhecido @ %.0f %s"
+
+#: profile.c:2215
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2184
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2208
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2187
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2149
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2167
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2170
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: planner.c:501
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr "%s\nPlano de Mergulho Subsurface\nbaseado em GFlow = %.0f e GFhigh = %.0f\n\n"
+
+#: profile.c:2154
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2203
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2199
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2195
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
+msgstr ""
+
+#: dive.c:921
+#, c-format
+msgid "(%s) or (%s)"
+msgstr ""
+
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr ""
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr ""
+
+#: statistics.c:265
+#, c-format
+msgid "(no dives)"
+msgstr ""
+
+#: gtk-gui.c:2392
+msgid "(nothing)"
+msgstr ""
+
+#: planner-gtk.c:389
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner-gtk.c:388
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: planner-gtk.c:394
+msgid "17 l/min"
+msgstr ""
+
+#: print.c:956
+msgid "2 dives per page"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner-gtk.c:393
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:999
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:952
+msgid "6 dives per page"
+msgstr "6 mergulhos por página"
+
+#: planner-gtk.c:336
+msgid ""
+"<small>Add segments below.\n"
+"Each line describes part of the planned dive.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
+"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
+msgstr ""
+
+#: planner-gtk.c:262
+msgid "AIR"
+msgstr "AR"
+
+#: gtk-gui.c:1284 gtk-gui.c:1641
+msgid "About Subsurface"
+msgstr "Sobre o Subsurface"
+
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
+msgid "Add Dive..."
+msgstr "Adicionar mergulho..."
+
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
+msgid "Add dive"
+msgstr "Adicionar mergulho..."
+
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
+msgid "Add to trip above"
+msgstr ""
+
+#: planner-gtk.c:413
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics-gtk.c:608
+msgid "Air Press"
+msgstr "Pressão do Ar"
+
+#: statistics-gtk.c:607
+msgid "Air Temp"
+msgstr "Temperatura do Ar"
+
+#: info-gtk.c:596
+#, c-format
+msgid "Air Temp in %s"
+msgstr "Temperatuda do ar em %s"
+
+#: download-dialog.c:390
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:77
+msgid "Apr"
+msgstr "Abr"
+
+#: main.c:78
+msgid "Aug"
+msgstr "Ago"
+
+#: gtk-gui.c:1655
+msgid "Autogroup"
+msgstr ""
+
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
+msgctxt "Depth"
+msgid "Average"
+msgstr "Média"
+
+#: statistics-gtk.c:97
+msgctxt "Duration"
+msgid "Average"
+msgstr "Média"
+
+#: statistics-gtk.c:103
+msgctxt "SAC"
+msgid "Average"
+msgstr "Média"
+
+#: statistics-gtk.c:106
+msgctxt "Temp"
+msgid "Average"
+msgstr "Média"
+
+#: statistics-gtk.c:562 statistics-gtk.c:599
+msgid "Avg Depth"
+msgstr "Profundidade Média"
+
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:570
+msgid "Avg SAC"
+msgstr "SAC Média"
+
+#: statistics-gtk.c:545
+msgid "Avg Temp"
+msgstr "Temperatura Média"
+
+#: statistics-gtk.c:552
+msgid "Avg Time"
+msgstr ""
+
+#: profile.c:426
+#, c-format
+msgid "Bailing out to OC"
+msgstr ""
+
+#: gtk-gui.c:790
+msgid "Bar"
+msgstr ""
+
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
+msgid "Buddy"
+msgstr "Parceiro"
+
+#: planner-gtk.c:291
+msgid "CC SetPoint"
+msgstr ""
+
+#: planner.c:123
+#, c-format
+msgid "Can't find gas %d/%d"
+msgstr ""
+
+#: parse-xml.c:1953
+#, c-format
+msgid "Can't open stylesheet (%s)/%s"
+msgstr ""
+
+#: uemis-downloader.c:932
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:757
+msgid "Cancelled..."
+msgstr ""
+
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:800
+msgid "Celsius"
+msgstr "Celsius"
+
+#: gtk-gui.c:686
+msgid "Choose Default XML File"
+msgstr ""
+
+#: gtk-gui.c:2294
+msgid "Choose XML Files To Import Into Current Data File"
+msgstr ""
+
+#: gtk-gui.c:1622
+msgid "Close"
+msgstr "Fechar"
+
+#: divelist-gtk.c:1815
+msgid "Collapse all"
+msgstr ""
+
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: webservice.c:25
+msgid "Connection Error: "
+msgstr "Erro de conexão:"
+
+#: divelist-gtk.c:1787
+msgid "Create new trip above"
+msgstr ""
+
+#: gtk-gui.c:796
+msgid "CuFt"
+msgstr ""
+
+#: divelist-gtk.c:824 gtk-gui.c:820
+msgid "Cyl"
+msgstr ""
+
+#: equipment.c:982 equipment.c:1093 print.c:201
+msgid "Cylinder"
+msgstr "Cilindro"
+
+#: planner.c:184
+msgid "Cylinder for planning"
+msgstr "Cilindro para planejamento"
+
+#: equipment.c:1603
+msgid "Cylinders"
+msgstr "Cilindros"
+
+#: profile.c:2145
+#, c-format
+msgid "D:%.1f %s"
+msgstr ""
+
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
+msgid "Date"
+msgstr "Data"
+
+#: info-gtk.c:821
+msgid "Date and Time"
+msgstr "Data e Hora"
+
+#: info-gtk.c:831
+msgid "Date:"
+msgstr "Data:"
+
+#: main.c:78
+msgid "Dec"
+msgstr ""
+
+#: gtk-gui.c:862
+msgid "Default XML Data File"
+msgstr ""
+
+#: gtk-gui.c:1569
+msgid "Delete a dive computer information entry"
+msgstr ""
+
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
+msgid "Delete dive"
+msgstr "Remover mergulho"
+
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
+msgid "Delete dives"
+msgstr "Remover mergulhos"
+
+#: print.c:502 statistics-gtk.c:92
+msgid "Depth"
+msgstr "Profundidade"
+
+#: uemis.c:222
+msgid "Depth Limit Exceeded"
+msgstr "Limite de profundidade excedido"
+
+#: gtk-gui.c:784
+msgid "Depth:"
+msgstr "Profundidade:"
+
+#: gtk-gui.c:1528
+msgid "Device Id"
+msgstr "ID do dispositivo"
+
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#. <trailing text>
+#: info.c:88
+#, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr ""
+
+#: info.c:130 print.c:83
+#, c-format
+msgid "Dive #%d - "
+msgstr ""
+
+#: libdivecomputer.c:436
+#, c-format
+msgid "Dive %d: %s %d %04d"
+msgstr ""
+
+#: gtk-gui.c:2374
+msgid "Dive Computer Nickname"
+msgstr "Apelido do computador de mergulho"
+
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
+msgid "Dive Info"
+msgstr "Info do mergulho"
+
+#: gtk-gui.c:1872
+msgid "Dive Notes"
+msgstr "Notas do mergulho"
+
+#: planner-gtk.c:360
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
+msgid "Dive Time"
+msgstr "Tempo de mergulho"
+
+#: uemis.c:228
+msgid "Dive Time Alert"
+msgstr "Alerta de tempo de mergulho"
+
+#: uemis.c:226
+msgid "Dive Time Info"
+msgstr "Info de tempo de mergulho"
+
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr "Fabricante do computador e produto"
+
+#: libdivecomputer.c:681
+msgid "Dive data import error"
+msgstr ""
+
+#: gps.c:214
+msgid "Dive locations"
+msgstr "Pontos de mergulho"
+
+#: info-gtk.c:581
+msgid "Dive master"
+msgstr "Professor de mergulho"
+
+#: planner-gtk.c:382
+msgid "Dive starts when?"
+msgstr "Quando começa o mergulho?"
+
+#: print.c:502
+msgid "Dive#"
+msgstr "Mergulho#"
+
+#: gtk-gui.c:845
+msgid "Divelist Font"
+msgstr ""
+
+#: info-gtk.c:1001
+msgid "Divemaster"
+msgstr "Instrutor de Mergulho"
+
+#: statistics-gtk.c:542
+msgid "Dives"
+msgstr ""
+
+#: gtk-gui.c:1636
+msgid "Dives Locations"
+msgstr ""
+
+#: download-dialog.c:365
+msgid "Download From Dive Computer"
+msgstr ""
+
+#: gtk-gui.c:1629
+msgid "Download From Dive Computer..."
+msgstr ""
+
+#: webservice.c:260
+msgid "Download From Web Service"
+msgstr ""
+
+#: gtk-gui.c:1630
+msgid "Download From Web Service..."
+msgstr ""
+
+#: webservice.c:31
+msgid "Download Success!"
+msgstr ""
+
+#: print.c:502 statistics-gtk.c:92
+msgid "Duration"
+msgstr ""
+
+#: info-gtk.c:908
+msgid "Duration (min)"
+msgstr ""
+
+#: info.c:312
+msgid "E"
+msgstr ""
+
+#: planner.c:88
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner-gtk.c:263
+msgid "EAN32"
+msgstr ""
+
+#: planner-gtk.c:264
+msgid "EAN36"
+msgstr ""
+
+#: info-gtk.c:99
+msgid "Edit"
+msgstr "Editar"
+
+#: gtk-gui.c:1647
+msgid "Edit Device Names"
+msgstr ""
+
+#: gtk-gui.c:1501
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info-gtk.c:663
+msgid "Edit Trip Info"
+msgstr ""
+
+#: divelist-gtk.c:1680
+msgid "Edit Trip Summary"
+msgstr ""
+
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist-gtk.c:1650
+msgid "Edit dive"
+msgstr "Editar mergulho"
+
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
+msgid "Edit dive date/time"
+msgstr ""
+
+#: divelist-gtk.c:1649
+msgid "Edit dives"
+msgstr "Editar mergulhos"
+
+#: info-gtk.c:539
+msgid "Edit multiple dives"
+msgstr "Editar múltiplos mergulhos"
+
+#: info-gtk.c:369
+msgid "Edit trip summary"
+msgstr ""
+
+#: gtk-gui.c:1183
+msgid "Enable / Disable Events"
+msgstr ""
+
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
+msgid "End"
+msgstr ""
+
+#: planner-gtk.c:288
+msgid "Ending Depth"
+msgstr ""
+
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
+msgstr ""
+
+#: gtk-gui.c:1876 info-gtk.c:648
+msgid "Equipment"
+msgstr ""
+
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr "Erro"
+
+#: libdivecomputer.c:471
+msgid "Error obtaining water salinity"
+msgstr ""
+
+#: libdivecomputer.c:419
+msgid "Error parsing the datetime"
+msgstr ""
+
+#: libdivecomputer.c:441
+msgid "Error parsing the divetime"
+msgstr ""
+
+#: libdivecomputer.c:480
+msgid "Error parsing the gas mix"
+msgstr ""
+
+#: libdivecomputer.c:461
+msgid "Error parsing the gas mix count"
+msgstr ""
+
+#: libdivecomputer.c:451
+msgid "Error parsing the maxdepth"
+msgstr ""
+
+#: libdivecomputer.c:488
+msgid "Error parsing the samples"
+msgstr ""
+
+#: libdivecomputer.c:677
+msgid "Error registering the cancellation handler."
+msgstr ""
+
+#: libdivecomputer.c:410
+msgid "Error registering the data"
+msgstr ""
+
+#: libdivecomputer.c:672
+msgid "Error registering the event handler."
+msgstr ""
+
+#: libdivecomputer.c:645
+#, c-format
+msgid "Event: systime=%<PRId64>, devtime=%u\n"
+msgstr ""
+
+#: libdivecomputer.c:622
+msgid "Event: waiting for user action"
+msgstr ""
+
+#: divelist-gtk.c:1811
+msgid "Expand all"
+msgstr ""
+
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
+msgid "Fahrenheit"
+msgstr ""
+
+#: gtk-gui.c:124
+#, c-format
+msgid "Failed to open %i files."
+msgstr ""
+
+#: parse-xml.c:1599
+#, c-format
+msgid "Failed to parse '%s'"
+msgstr ""
+
+#: parse-xml.c:1598
+#, c-format
+msgid "Failed to parse '%s'.\n"
+msgstr ""
+
+#: file.c:282
+#, c-format
+msgid "Failed to read '%s'"
+msgstr ""
+
+#: file.c:278
+#, c-format
+msgid "Failed to read '%s'.\n"
+msgstr ""
+
+#: main.c:77
+msgid "Feb"
+msgstr ""
+
+#: gtk-gui.c:786
+msgid "Feet"
+msgstr ""
+
+#: gtk-gui.c:1612
+msgid "File"
+msgstr "Arquivo"
+
+#: gtk-gui.c:1615
+msgid "Filter"
+msgstr ""
+
+#: download-dialog.c:384
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:68
+msgid "Fri"
+msgstr ""
+
+#: gtk-gui.c:1017
+msgid "GFhigh"
+msgstr ""
+
+#: planner-gtk.c:405
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:1007
+msgid "GFlow"
+msgstr ""
+
+#: planner-gtk.c:404
+msgid "GFlow for plan"
+msgstr ""
+
+#: info-gtk.c:559
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#. ++GETTEXT Gas Used is amount used
+#: print.c:203
+msgid "Gas Used"
+msgstr ""
+
+#: statistics-gtk.c:617
+msgctxt "Amount"
+msgid "Gas Used"
+msgstr ""
+
+#: planner-gtk.c:290
+msgctxt "Type of"
+msgid "Gas Used"
+msgstr ""
+
+#: planner.c:570
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:1023 print.c:201
+msgid "Gasmix"
+msgstr ""
+
+#: gtk-gui.c:777
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1617
+msgid "Help"
+msgstr ""
+
+#: webservice.c:296
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr "Importar arquivo(s)..."
+
+#: divelist-gtk.c:1378 gtk-gui.c:1645
+msgid "Info"
+msgstr ""
+
+#: uemis-downloader.c:769
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1650
+msgid "Input Plan"
+msgstr ""
+
+#: planner-gtk.c:145
+#, c-format
+msgid "Invalid depth - could not parse \"%s\""
+msgstr ""
+
+#: planner-gtk.c:147
+msgid "Invalid depth - values deeper than 400m not supported"
+msgstr ""
+
+#: planner-gtk.c:118
+#, c-format
+msgid "Invalid gas for row %d"
+msgstr ""
+
+#: planner-gtk.c:207
+msgid "Invalid starttime"
+msgstr ""
+
+#: webservice.c:27
+msgid "Invalid user identifier!"
+msgstr ""
+
+#. ++GETTEXT: these are three letter months - we allow up to six code bytes
+#: main.c:77
+msgid "Jan"
+msgstr ""
+
+#: main.c:78
+msgid "Jul"
+msgstr ""
+
+#: main.c:77
+msgid "Jun"
+msgstr ""
+
+#: print.c:985
+msgid "Layout Options"
+msgstr "Opções de layout"
+
+#: gtk-gui.c:1290
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
+msgstr ""
+
+#: gtk-gui.c:1643
+msgid "List"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Liter"
+msgstr ""
+
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
+msgid "Location"
+msgstr "Local"
+
+#: gtk-gui.c:1613
+msgid "Log"
+msgstr "Log"
+
+#: statistics-gtk.c:99
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+
+#: statistics-gtk.c:553
+msgid "Longest Dive"
+msgstr ""
+
+#: uemis.c:236
+msgid "Low Battery Alert"
+msgstr "Alerta de nível de bateria"
+
+#: uemis.c:234
+msgid "Low Battery Warning"
+msgstr "Aviso de nível de bateria"
+
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr ""
+
+#: main.c:77
+msgid "Mar"
+msgstr ""
+
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
+msgid "Mark location here"
+msgstr ""
+
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
+#: uemis.c:230
+msgid "Marker"
+msgstr "Marcador"
+
+#: print.c:502
+msgid "Master"
+msgstr ""
+
+#: uemis.c:224
+msgid "Max Deco Time Warning"
+msgstr ""
+
+#: statistics-gtk.c:560 statistics-gtk.c:598
+msgid "Max Depth"
+msgstr ""
+
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:568
+msgid "Max SAC"
+msgstr ""
+
+#: statistics-gtk.c:543
+msgid "Max Temp"
+msgstr ""
+
+#: print.c:109
+#, c-format
+msgid ""
+"Max depth: %.*f %s\n"
+"Duration: %d min\n"
+"%s"
+msgstr ""
+
+#: print.c:377
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1518
+msgid "MaxPress"
+msgstr ""
+
+#: statistics-gtk.c:102
+msgctxt "Depth"
+msgid "Maximum"
+msgstr "Máximo"
+
+#: statistics-gtk.c:105
+msgctxt "SAC"
+msgid "Maximum"
+msgstr "Máximo"
+
+#: statistics-gtk.c:108
+msgctxt "Temp"
+msgid "Maximum"
+msgstr "Máximo"
+
+#: main.c:77
+msgid "May"
+msgstr "Mai"
+
+#: divelist-gtk.c:1641
+msgid "Merge dives"
+msgstr "Mesclar mergulhos"
+
+#: divelist-gtk.c:1688
+msgid "Merge trip with trip above"
+msgstr ""
+
+#: divelist-gtk.c:1698
+msgid "Merge trip with trip below"
+msgstr ""
+
+#: gtk-gui.c:785
+msgid "Meter"
+msgstr "Metro"
+
+#: statistics-gtk.c:561
+msgid "Min Depth"
+msgstr "Profundidade mínima"
+
+#: statistics-gtk.c:569
+msgid "Min SAC"
+msgstr ""
+
+#: statistics-gtk.c:544
+msgid "Min Temp"
+msgstr "Temperatura Mínima"
+
+#: statistics-gtk.c:101
+msgctxt "Depth"
+msgid "Minimum"
+msgstr ""
+
+#: statistics-gtk.c:104
+msgctxt "SAC"
+msgid "Minimum"
+msgstr ""
+
+#: statistics-gtk.c:107
+msgctxt "Temp"
+msgid "Minimum"
+msgstr ""
+
+#: gtk-gui.c:851
+msgid "Misc. Options"
+msgstr ""
+
+#: gtk-gui.c:1523
+msgid "Model"
+msgstr ""
+
+#: main.c:68
+msgid "Mon"
+msgstr ""
+
+#: gtk-gui.c:1286
+msgid "Multi-platform divelog software in C"
+msgstr ""
+
+#: info.c:311
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1618
+msgid "New"
+msgstr ""
+
+#: gtk-gui.c:1238
+msgid "New starting number"
+msgstr ""
+
+#: gtk-gui.c:1649
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1533 gtk-gui.c:2396
+msgid "Nickname"
+msgstr "Apelido"
+
+#: uemis.c:232
+msgid "No Tank Data"
+msgstr ""
+
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
+msgid "Notes"
+msgstr ""
+
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr "Notas no topo"
+
+#: main.c:78
+msgid "Nov"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "OLF"
+msgstr ""
+
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
+#, c-format
+msgid "OTU"
+msgstr ""
+
+#: main.c:78
+msgid "Oct"
+msgstr ""
+
+#: libdivecomputer.c:770
+msgid "Odd pthread error return"
+msgstr ""
+
+#: gtk-gui.c:1580
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
+msgid "Open File"
+msgstr "Abrir arquivo"
+
+#: gtk-gui.c:1619
+msgid "Open..."
+msgstr ""
+
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:173
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "PO2"
+msgstr ""
+
+#: uemis.c:210
+msgid "PO2 Ascend Alarm"
+msgstr ""
+
+#: uemis.c:208
+msgid "PO2 Ascend Warning"
+msgstr ""
+
+#: uemis.c:205
+msgid "PO2 Green Warning"
+msgstr ""
+
+#: gtk-gui.c:791
+msgid "PSI"
+msgstr ""
+
+#: webservice.c:341
+msgid "Password"
+msgstr "Senha"
+
+#: info-gtk.c:570
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1616
+msgid "Planner"
+msgstr ""
+
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
+msgid "Preferences"
+msgstr ""
+
+#: gtk-gui.c:1632
+msgid "Preferences..."
+msgstr ""
+
+#: equipment.c:1002 equipment.c:1008
+msgid "Pressure"
+msgstr ""
+
+#: gtk-gui.c:789
+msgid "Pressure:"
+msgstr ""
+
+#: gtk-gui.c:1648
+msgid "Prev DC"
+msgstr ""
+
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
+msgid "Print only selected dives"
+msgstr ""
+
+#: print.c:974
+msgid "Print selection"
+msgstr ""
+
+#: print.c:939 print.c:946
+msgid "Print type"
+msgstr ""
+
+#: gtk-gui.c:1623
+msgid "Print..."
+msgstr ""
+
+#: gtk-gui.c:1644
+msgid "Profile"
+msgstr "Perfil"
+
+#: gtk-gui.c:898
+msgid "Profile Settings"
+msgstr "Configurações de perfil"
+
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr "Perfil no topo"
+
+#: gtk-gui.c:1640
+msgid "Quit"
+msgstr ""
+
+#: uemis.c:218
+msgid "RGT Alert"
+msgstr ""
+
+#: uemis.c:216
+msgid "RGT Warning"
+msgstr ""
+
+#: info-gtk.c:587 info-gtk.c:1007
+msgid "Rating"
+msgstr ""
+
+#: uemis-downloader.c:364
+#, c-format
+msgid "Reading %s %s"
+msgstr ""
+
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr "Remover"
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
+msgid "Remove Trip"
+msgstr ""
+
+#: divelist-gtk.c:1805
+msgid "Remove dive from trip"
+msgstr ""
+
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
+msgid "Remove selected dives from trip"
+msgstr ""
+
+#: gtk-gui.c:1229
+msgid "Renumber"
+msgstr ""
+
+#: gtk-gui.c:1633
+msgid "Renumber..."
+msgstr ""
+
+#: download-dialog.c:141
+msgid "Retry"
+msgstr ""
+
+#: info.c:311
+msgid "S"
+msgstr ""
+
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
+#, c-format
+msgid "SAC"
+msgstr ""
+
+#: planner-gtk.c:399
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner-gtk.c:398
+msgid "SAC during dive"
+msgstr ""
+
+#: uemis.c:198
+msgid "Safety Stop Violation"
+msgstr ""
+
+#: main.c:68
+msgid "Sat"
+msgstr ""
+
+#: gtk-gui.c:1621
+msgid "Save As..."
+msgstr ""
+
+#: gtk-gui.c:227
+msgid "Save Changes?"
+msgstr ""
+
+#: divelist-gtk.c:1028 gtk-gui.c:164
+msgid "Save File As"
+msgstr "Salvar aquivo como"
+
+#: divelist-gtk.c:1720
+msgid "Save as"
+msgstr ""
+
+#: gtk-gui.c:1620
+msgid "Save..."
+msgstr ""
+
+#: planner-gtk.c:289
+msgid "Segment Time"
+msgstr ""
+
+#: gtk-gui.c:1174
+msgid "Select Events"
+msgstr ""
+
+#: gtk-gui.c:1638
+msgid "Select Events..."
+msgstr ""
+
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
+msgid "Sep"
+msgstr ""
+
+#: uemis-downloader.c:30
+msgid ""
+"Short write to req.txt file\n"
+"Is the Uemis Zurich plugged in correctly?"
+msgstr ""
+
+#: statistics-gtk.c:98
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+
+#: statistics-gtk.c:554
+msgid "Shortest Dive"
+msgstr ""
+
+#: gtk-gui.c:809 gtk-gui.c:882
+msgid "Show Columns"
+msgstr ""
+
+#: gtk-gui.c:978
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:961
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:994
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:986
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist-gtk.c:1776
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:944
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:925
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:906
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:209
+msgid "Simulated Dive"
+msgstr ""
+
+#: equipment.c:999 equipment.c:1517
+msgid "Size"
+msgstr ""
+
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
+#: uemis.c:200
+msgid "Speed Alarm"
+msgstr ""
+
+#: uemis.c:203
+msgid "Speed Warning"
+msgstr ""
+
+#: equipment.c:1010 equipment.c:1519
+msgid "Start"
+msgstr ""
+
+#: uemis-downloader.c:782
+msgid "Start download"
+msgstr ""
+
+#: statistics-gtk.c:532
+msgid "Statistics"
+msgstr ""
+
+#: statistics-gtk.c:468
+#, c-format
+msgid "Statistics %s"
+msgstr ""
+
+#: gtk-gui.c:1884
+msgid "Stats"
+msgstr ""
+
+#: webservice.c:295
+msgid "Status"
+msgstr ""
+
+#: planner.c:551
+#, c-format
+msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
+#: parse-xml.c:443
+#, c-format
+msgid "Strange percentage reading %s\n"
+msgstr ""
+
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
+msgid "Suit"
+msgstr ""
+
+#. ++GETTEXT: these are three letter days - we allow up to six code bytes
+#: main.c:68
+msgid "Sun"
+msgstr ""
+
+#: statistics-gtk.c:592
+msgid "Surf Intv"
+msgstr ""
+
+#: planner-gtk.c:383
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:562
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:960
+msgid "Table print"
+msgstr ""
+
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
+#: uemis.c:220
+msgid "Tank Change Suggested"
+msgstr ""
+
+#: uemis.c:214
+msgid "Tank Pressure Info"
+msgstr ""
+
+#: gtk-gui.c:880
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:815
+msgid "Temp"
+msgstr ""
+
+#: statistics-gtk.c:92
+msgid "Temperature"
+msgstr ""
+
+#: gtk-gui.c:799
+msgid "Temperature:"
+msgstr ""
+
+#: gtk-gui.c:1646
+msgid "Three"
+msgstr ""
+
+#: main.c:68
+msgid "Thu"
+msgstr ""
+
+#: info-gtk.c:838
+msgid "Time"
+msgstr ""
+
+#: gtk-gui.c:1768
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1656
+msgid "Toggle Zoom"
+msgstr ""
+
+#: planner.c:286
+msgid "Too many gas mixes"
+msgstr ""
+
+#: planner-gtk.c:317
+msgid "Too many waypoints"
+msgstr ""
+
+#: statistics-gtk.c:96
+msgctxt "Duration"
+msgid "Total"
+msgstr ""
+
+#: statistics-gtk.c:551
+msgid "Total Time"
+msgstr ""
+
+#: print.c:340
+#, c-format
+msgid "Total Weight:"
+msgstr ""
+
+#: planner.c:542
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:583
+#, 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)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main.c:68
+msgid "Tue"
+msgstr ""
+
+#: equipment.c:1516 equipment.c:1544
+msgid "Type"
+msgstr ""
+
+#: uemis-downloader.c:28
+msgid ""
+"Uemis Zurich: File System is almost full\n"
+"Disconnect/reconnect the dive computer\n"
+"and click 'Retry'"
+msgstr ""
+
+#: uemis-downloader.c:29
+msgid ""
+"Uemis Zurich: File System is full\n"
+"Disconnect/reconnect the dive computer\n"
+"and try again"
+msgstr ""
+
+#: uemis-downloader.c:771
+msgid "Uemis init failed"
+msgstr ""
+
+#: libdivecomputer.c:699
+msgid "Unable to create libdivecomputer context"
+msgstr ""
+
+#: libdivecomputer.c:404
+#, c-format
+msgid "Unable to create parser for %s %s"
+msgstr ""
+
+#: libdivecomputer.c:701
+#, c-format
+msgid "Unable to open %s %s (%s)"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Units"
+msgstr "Unidades"
+
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
+msgid "Use right click to mark dive location at cursor"
+msgstr ""
+
+#: webservice.c:282 webservice.c:333
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1642
+msgid "User Manual"
+msgstr ""
+
+#: gtk-gui.c:1614
+msgid "View"
+msgstr "Visualizar"
+
+#: info-gtk.c:593 statistics-gtk.c:600
+msgid "Visibility"
+msgstr "Visibilidade"
+
+#: gtk-gui.c:794
+msgid "Volume:"
+msgstr "Volume:"
+
+#: info.c:312
+msgid "W"
+msgstr ""
+
+#: planner-gtk.c:162
+msgid "Warning - extremely long dives can cause long calculation time"
+msgstr ""
+
+#: planner-gtk.c:137
+msgid "Warning - planning very deep dives can take excessive amounts of time"
+msgstr ""
+
+#: statistics-gtk.c:606
+msgid "Water Temp"
+msgstr ""
+
+#: webservice.c:163
+msgid "Webservice"
+msgstr ""
+
+#: main.c:68
+msgid "Wed"
+msgstr ""
+
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
+msgid "Weight"
+msgstr ""
+
+#: equipment.c:1148 print.c:308
+#, c-format
+msgid "Weight System"
+msgstr ""
+
+#: gtk-gui.c:804
+msgid "Weight:"
+msgstr ""
+
+#: gtk-gui.c:152
+msgid "XML file"
+msgstr ""
+
+#: statistics-gtk.c:92
+msgid "Year"
+msgstr "Ano"
+
+#: gtk-gui.c:1634 statistics-gtk.c:295
+msgid "Yearly Statistics"
+msgstr ""
+
+#: gtk-gui.c:2382
+#, c-format
+msgid ""
+"You already have a dive computer of this model\n"
+"named %s\n"
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
+msgstr ""
+
+#: gtk-gui.c:237
+msgid ""
+"You have unsaved changes\n"
+"Would you like to save those before closing the datafile?"
+msgstr ""
+
+#: gtk-gui.c:240 gtk-gui.c:243
+#, c-format
+msgid ""
+"You have unsaved changes to file: %s \n"
+"Would you like to save those before closing the datafile?"
+msgstr ""
+
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
+#, c-format
+msgid "air"
+msgstr "ar"
+
+#: libdivecomputer.c:153
+msgid "airtime"
+msgstr ""
+
+#: statistics.c:21
+msgid "altitude"
+msgstr "altitude"
+
+#: equipment.c:892
+msgid "ankle"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "ascent"
+msgstr ""
+
+#: equipment.c:893
+msgid "backplate weight"
+msgstr ""
+
+#: dive.c:48
+msgid "bar"
+msgstr ""
+
+#: equipment.c:891
+msgid "belt"
+msgstr "cinto"
+
+#: statistics.c:20
+msgid "boat"
+msgstr "barco"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
+msgid "bookmark"
+msgstr "favorito"
+
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr "caverna"
+
+#: libdivecomputer.c:149
+msgid "ceiling"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "ceiling (safety stop)"
+msgstr ""
+
+#: equipment.c:894
+msgid "clip-on"
+msgstr ""
+
+#: dive.c:93 planner.c:951
+msgid "cuft"
+msgstr ""
+
+#: uemis-downloader.c:384
+msgid "data"
+msgstr "data"
+
+#: libdivecomputer.c:149
+msgid "deco stop"
+msgstr ""
+
+#: statistics.c:20
+msgid "deep"
+msgstr "profundo"
+
+#: libdivecomputer.c:152
+msgid "deepstop"
+msgstr ""
+
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
+msgid "divetime"
+msgstr ""
+
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr "roupa seca"
+
+#: planner.c:780
+msgid "ean"
+msgstr ""
+
+#: statistics.c:263
+#, c-format
+msgid "for all dives"
+msgstr "para todos os mergulhos"
+
+#: statistics.c:259
+#, c-format
+msgid "for dive #%d"
+msgstr ""
+
+#: statistics.c:217
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:261
+#, c-format
+msgid "for selected dive"
+msgstr ""
+
+#: statistics.c:224
+#, c-format
+msgid "for selected dives"
+msgstr ""
+
+#: statistics.c:22
+msgid "freshwater"
+msgstr "águar gelada"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
+msgid "ft"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
+msgid "gaschange"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "heading"
+msgstr ""
+
+#: statistics.c:21
+msgid "ice"
+msgstr "gelo"
+
+#: equipment.c:890
+msgid "integrated"
+msgstr "integrado"
+
+#: statistics.c:20
+msgid "invalid"
+msgstr "inválido"
+
+#: libdivecomputer.c:171
+msgid "invalid event number"
+msgstr "numero de evento inválido"
+
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr "colete"
+
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
+msgid "kg"
+msgstr "kg"
+
+#: dive.c:88
+msgid "l"
+msgstr "l"
+
+#: statistics.c:21
+msgid "lake"
+msgstr "lago"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
+msgid "lbs"
+msgstr "lbs"
+
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
+msgid "m"
+msgstr ""
+
+#: gtk-gui.c:966
+msgid "max ppO2"
+msgstr "max ppO2"
+
+#: divelist-gtk.c:828 gtk-gui.c:893
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "maxdepth"
+msgstr "maxdepth"
+
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr "membrana"
+
+#: divelist-gtk.c:820 planner.c:957
+msgid "min"
+msgstr "min"
+
+#: libdivecomputer.c:630
+#, c-format
+msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
+msgstr ""
+
+#: uemis-downloader.c:409
+msgid "more data dive id"
+msgstr ""
+
+#: statistics.c:198
+#, c-format
+msgid "more than %d days"
+msgstr ""
+
+#: statistics.c:22
+msgid "night"
+msgstr "noite"
+
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "none"
+msgstr ""
+
+#: gtk-gui.c:949
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:931
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:912
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:44
+msgid "pascal"
+msgstr ""
+
+#: statistics.c:23
+msgid "photo"
+msgstr "foto"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "piscina"
+
+#: dive.c:52
+msgid "psi"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "rbt"
+msgstr ""
+
+#: libdivecomputer.c:153
+msgid "rgbm"
+msgstr ""
+
+#: statistics.c:22
+msgid "river"
+msgstr "rio"
+
+#: libdivecomputer.c:150
+msgid "safety stop"
+msgstr ""
+
+#: libdivecomputer.c:151
+msgid "safety stop (mandatory)"
+msgstr ""
+
+#: libdivecomputer.c:151
+msgid "safety stop (voluntary)"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
+msgid "surface"
+msgstr ""
+
+#: statistics.c:22
+msgid "teaching"
+msgstr "ensinando"
+
+#: libdivecomputer.c:154
+msgid "tissue level warning"
+msgstr ""
+
+#: statistics.c:22
+msgid "training"
+msgstr "treinando"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
+msgid "translator-credits"
+msgstr "créditos-de-tradução"
+
+#: libdivecomputer.c:150
+msgid "transmitter"
+msgstr ""
+
+#: equipment.c:1409 equipment.c:1429
+msgid "unkn"
+msgstr ""
+
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
+msgid "unknown"
+msgstr ""
+
+#: equipment.c:540
+msgid "unspecified"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: statistics.c:23
+msgid "video"
+msgstr "vídeo"
+
+#: libdivecomputer.c:150
+msgid "violation"
+msgstr ""
+
+#: equipment.c:1545
+msgid "weight"
+msgstr ""
+
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
+msgid "workload"
+msgstr ""
+
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index d6243357b..025022e8f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,296 +1,283 @@
-# Spanish translations for Subsurface package
-# Spanish messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-13 23:39-0800\n"
-"PO-Revision-Date: 2013-02-27 23:05+0100\n"
-"Last-Translator: Eduardo Ramalho <eduardo.ramalho@gmail.com>\n"
-"Language-Team: Spanish\n"
-"Language: es\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/subsurface/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Basepath: ../\n"
 
-#: statistics.c:177
+#: gtk-gui.c:1190
+msgid ""
+"\n"
+"No Events\n"
+msgstr ""
+
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr "> Mês"
 
-#: webservice.c:237
+#: webservice.c:289
 msgid " Download"
 msgstr "Transferir"
 
-#: download-dialog.c:375
+#: download-dialog.c:374
 msgid " Please select dive computer and device. "
 msgstr " Por favor, seleccione o computador de mergulho."
 
-#: profile.c:413
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr "iniciar"
 
-#: profile.c:414
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr "fim"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "#"
 
-#: print.c:308
+#: print.c:267 print.c:326
 #, c-format
 msgid "%.*f %s"
 msgstr "%.*f %s"
 
-#: print.c:253 print.c:326
+#: print.c:344
 #, c-format
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:605
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s de %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:82
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
+#: print.c:88
 #, c-format
 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:560
+#: print.c:566
 #, 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:277
+#: divelist.c:569
 #, 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:549
+#: statistics-gtk.c:349
 #, 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:585 statistics.c:556
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d minutos"
 
-#: statistics.c:521
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd, %dh %dmin"
 
-#: statistics.c:523
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
 
-#: print.c:304
+#: print.c:322
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2148
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2116
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Tecto calculado %.0f %s"
+msgstr "%s\nTecto calculado %.0f %s"
 
-#: profile.c:2132
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:%umin @ %.0f %s"
+msgstr "%s\nDeco:%umin @ %.0f %s"
 
-#: profile.c:2135
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:Tempo desconhecido @ %.0f %s"
+msgstr "%s\nDeco:Tempo desconhecido @ %.0f %s"
 
-#: profile.c:2172
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"PEA:%d%s\n"
-"PNE:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nPEA:%d%s\nPNE:%d%s\nEADD:%d%s"
 
-#: profile.c:2141
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"Em deco"
+msgstr "%s\nEm deco"
 
-#: profile.c:2165
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2144
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2106
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2124
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Paragem de segurança:%umin @ %.0f %s"
+msgstr "%s\nParagem de segurança:%umin @ %.0f %s"
 
-#: profile.c:2127
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Paragem de segurança:tempo desconhecido @ %.0f %s"
+msgstr "%s\nParagem de segurança:tempo desconhecido @ %.0f %s"
 
-#: planner.c:525
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Plano de mergulho Subsurface\n"
-"baseado em GFinferior = %.0f  y  GFsuperior = %.0f\n"
-"\n"
+msgstr "%s\nPlano de mergulho Subsurface\nbaseado em GFinferior = %.0f  y  GFsuperior = %.0f\n\n"
 
-#: profile.c:2111
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2160
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2156
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2152
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
 msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
 
-#: dive.c:874
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) ou (%s)"
 
-#: statistics.c:683
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr ""
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr ""
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(nenhum mergulho)"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(vazio)"
 
-#: planner.c:1315
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 pés³/min"
 
-#: planner.c:1314
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 pés³/min"
 
-#: planner.c:1320
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:909
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 mergulhos por página"
 
@@ -298,145 +285,170 @@ msgstr "2 mergulhos por página"
 msgid "2 pcs full suit"
 msgstr "Fato completo 2 peças"
 
-#: planner.c:1319
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "Incrementos de 3m para o tecto calculado"
 
-#: print.c:905
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 imersões por página"
 
-#: planner.c:1264
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
 msgstr ""
-"<small>Adicionar as secções em baixo.\n"
-"Cada linha descreve parte do plano de mergulho.\n"
-"Uma entrada com uma profundidade, tempo e gás descreve uma secção que termina numa dada profundidade, dura o tempo assinalado (se for relativo, por exemplo '+3:30') ou termina no instante marcado (se for absoluto), e consome o gás indicado.\n"
-"Um gás vazio significa 'utilizar gás anterior' (ou AR se não especificado).\n"
-"Uma entrada que tenha profundidade e gás definido mas sem o tempo é especial. Informa o planeador que o gás especificado está disponível para a subida mal seja alcançada a profundidade indicada.\n"
-"CC Setpoint define imersões com CC (rebreather). Deixar vazio para circuito aberto.</small>\n"
 
-#: planner.c:1190
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "AR"
 
-#: gtk-gui.c:1058 gtk-gui.c:1381
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "Sobre Subsurface"
 
-#: gtk-gui.c:1372
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr ""
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Adicionar mergulho ..."
 
-#: divelist.c:2397
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Adicionar mergulho"
 
-#: divelist.c:2499
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Adicionar à expedição de mergulho anterior"
 
-#: planner.c:1339
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Adicionar ponto da rota"
 
-#: statistics.c:848
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Pressão atmosférica"
 
-#: statistics.c:847
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Temperatura do ar"
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Temperatura do ar em %s"
 
-#: download-dialog.c:391
+#: download-dialog.c:390
 msgid "Always prefer downloaded dive"
 msgstr "Preferir sempre mergulho transferido"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Abr"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Ago"
 
-#: gtk-gui.c:1394
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Auto Agrupar"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Média"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Média"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Média"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Média"
 
-#: statistics.c:802 statistics.c:839
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Prof. média"
 
-#: statistics.c:810
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "SAC médio"
 
-#: statistics.c:785
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Temp média"
 
-#: statistics.c:792
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Tempo médio"
 
-#: profile.c:410
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Troca de emergência para OC"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "Bar"
 
-#: info.c:800 info.c:1253 print.c:487
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Parceiro"
 
-#: planner.c:1219
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC SetPoint"
 
-#: planner.c:157
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Não encontro o gás %d/%d"
 
+#: parse-xml.c:1953
+#, c-format
+msgid "Can't open stylesheet (%s)/%s"
+msgstr ""
+
 #: uemis-downloader.c:932
 msgid "Cancelled, exiting cleanly..."
 msgstr "Cancelado, a fechar ..."
@@ -445,121 +457,143 @@ msgstr "Cancelado, a fechar ..."
 msgid "Cancelled..."
 msgstr "Cancelado..."
 
-#: webservice.c:27
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Não consigo analisar a resposta !"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:564
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Seleccionar arquivo XML predeterminado"
 
-#: gtk-gui.c:1900
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Seleccionar ficheiro XML para importar para arquivo de dados actual"
 
-#: gtk-gui.c:1367
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Encerrar"
 
-#: divelist.c:2517
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Colapsar"
 
-#: webservice.c:119
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Ligar ..."
 
-#: webservice.c:23
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Erro de ligação:"
 
-#: divelist.c:2489
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Atribuir a uma nova expedição de mergulho"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "pé^3"
 
-#: divelist.c:1431 gtk-gui.c:672
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Cil"
 
-#: equipment.c:918 equipment.c:1029 print.c:195
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Garrafa"
 
-#: planner.c:219
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Garrafa para planear"
 
-#: equipment.c:1539
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Garrafas"
 
-#: profile.c:2102
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "P:%.1f %s"
 
-#: planner.c:1276
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "CLÁUSULA DE DESRESPONSABILIZAÇÃO/AVISO:ESTA É UMA NOVA IMPLEMENTAÇÃO DO ALGORITMO BUHLMANN E DO SEU PLANEADOR DE MERGULHOS DERIVADO AO QUAL  SÓ FORAM REALIZADOS TESTES DE FORMA LIMITADA. RECOMENDAMOS FORTEMENTE PARA NUNCA PLANEAR MERGULHOS BASEADOS SIMPLESMENTE NOS RESULTADOS OBTIDOS AQUI."
 
-#: divelist.c:1424 print.c:486 statistics.c:830
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr ""
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Data"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Data:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Dez"
 
-#: gtk-gui.c:709
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Ficheiro XML por omissão"
 
-#: gtk-gui.c:1314
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Eliminar entrada do computador de mergulho"
 
-#: divelist.c:2239 divelist.c:2292 divelist.c:2384
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Eliminar mergulho"
 
-#: divelist.c:2241 divelist.c:2383
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Eliminar mergulhos"
 
-#: print.c:486 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Profundidade"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Profundidade (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Limite de profundidade ultrapassado"
 
-#: gtk-gui.c:636
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Profundidade:"
 
-#: gtk-gui.c:1273
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Identificador de dispositivo"
 
@@ -567,13 +601,18 @@ msgstr "Identificador de dispositivo"
 msgid "Device or mount point"
 msgstr "Dispositivo ou \"mount point\""
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Mergulho #%1$d - %2$s %3$02d/%4$02d/%5$04d às %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr ""
 
-#: info.c:157 print.c:77
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Mergulho #%d -"
@@ -583,23 +622,27 @@ msgstr "Mergulho #%d -"
 msgid "Dive %d: %s %d %04d"
 msgstr "Mergulho #%d:%s %d %04d"
 
-#: gtk-gui.c:1981
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Nome do computador de mergulho"
 
-#: gtk-gui.c:1611 info.c:998 statistics.c:821
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Informação do mergulho"
 
-#: gtk-gui.c:1603
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Notas do mergulho"
 
-#: planner.c:1286
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Plano de Mergulho - ISTO UMA SIMULAÇÃO; NÃO USAR PARA MERGULHAR"
 
-#: statistics.c:831
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr ""
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Duração do mergulho"
 
@@ -619,151 +662,159 @@ msgstr "Fabricante e modelo"
 msgid "Dive data import error"
 msgstr "Erro na importação dos dados do mergulho"
 
-#: print.c:895
-msgid "Dive details"
-msgstr "Detalhes do mergulho"
-
-#: gps.c:219
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Locais de mergulho"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Dive master"
 
-#: planner.c:1308
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Quando inicia o mergulho ?"
 
-#: print.c:486
+#: print.c:502
 msgid "Dive#"
 msgstr "Mergulho #"
 
-#: gtk-gui.c:697
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Fonte da lista de mergulhos"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:782
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Mergulhos"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Locais de Mergulho"
 
-#: download-dialog.c:366
+#: download-dialog.c:365
 msgid "Download From Dive Computer"
 msgstr "Transferir do Computador de Mergulho"
 
-#: gtk-gui.c:1370
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Transferir do Computador de Mergulho..."
 
-#: webservice.c:210
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Transferir do serviço web"
 
-#: gtk-gui.c:1371
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Transferir do serviço web ..."
 
-#: webservice.c:29
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Operação de transferência bem sucedida!"
 
-#: print.c:486 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Duração"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Duração (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "E"
 
-#: planner.c:126
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1191
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1192
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Editar"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Editar nomes do dispositivo"
 
-#: gtk-gui.c:1246
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Editar nomes do computador de mergulho"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Editar informação da expedição de mergulho"
 
-#: divelist.c:2405
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Editar resumo da expedição de mergulho"
 
-#: gtk-gui.c:1306
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Editar o nome de um computador de mergulho por duplo clique no campo do nome correspondente"
 
-#: divelist.c:2381
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Editar mergulho"
 
-#: divelist.c:2438 divelist.c:2461
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Editar data e hora de mergulho"
 
-#: divelist.c:2380
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Editar mergulhos"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Editar múltiplos mergulhos"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Editar resumo da expedição de mergulho"
 
-#: gtk-gui.c:961
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Activar / Desactivar eventos"
 
-#: equipment.c:949 equipment.c:1456
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr ""
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Fim"
 
-#: planner.c:1216
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Profundidade final"
 
-#: webservice.c:223
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Introduzir uma identificação do utilizador e seleccionar \"Transferir\". Após terminar seleccionar \"Aplicar\"."
 
-#: gtk-gui.c:1607 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Equipamento"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Erro na obtenção da salinidade da água."
@@ -813,124 +864,136 @@ msgstr "Evento: Hora de sistema=%<PRId64>, Hora do dispositivo=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Evento: à espera de acção do utilizador"
 
-#: divelist.c:2513
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Expandir todos"
 
-#: gtk-gui.c:653
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr ""
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr ""
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr ""
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Falha ao abrir  %i ficheiros."
 
-#: parse-xml.c:1448
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Falha na análise de '%s'"
 
-#: parse-xml.c:1443
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Falha na análise de '%s'.\n"
 
-#: file.c:267
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Falha na leitura de '%s'"
 
-#: file.c:263
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Falha na leitura de '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:638
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Pés"
 
-#: gtk-gui.c:1357
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Ficheiro"
 
-#: gtk-gui.c:1360
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filtros"
 
-#: download-dialog.c:385
+#: download-dialog.c:384
 msgid "Force download of all dives"
 msgstr "Forçar a transferência de todos os mergulhos"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Sex"
 
-#: gtk-gui.c:859
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFAlto"
 
-#: planner.c:1331
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFalto para planear"
 
-#: gtk-gui.c:849
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFbaixo"
 
-#: planner.c:1330
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFbaixo para planear"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS(formato WGS84 ou GPS)"
 
 #. ++GETTEXT Gas Used is amount used
-#: print.c:197
+#: print.c:203
 msgid "Gas Used"
 msgstr "Gás usado"
 
-#: statistics.c:857
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Gás usado"
 
-#: planner.c:1218
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Gás usado"
 
-#: planner.c:594
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Consumo de gás:\n"
 
-#: equipment.c:959 print.c:195
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Mistura de gás"
 
-#: gtk-gui.c:629
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Definições Gerais"
 
-#: gtk-gui.c:1362
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Ajuda"
 
-#: webservice.c:244
+#: webservice.c:296
 msgid "Idle"
 msgstr "parado"
 
-#: gtk-gui.c:1369
-msgid "Import XML File(s)..."
-msgstr "Importar Ficheiro(s) XML..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr ""
 
-#: gtk-gui.c:1384
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Info"
 
@@ -938,71 +1001,75 @@ msgstr "Info"
 msgid "Init Communication"
 msgstr "Iniciar Comunicação"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Introduzir Plano"
 
-#: planner.c:1079
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Profundidade inválida - Falha na análise  \"%s\""
 
-#: planner.c:1081
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Profundidade inválida - Não são suportadas profundidades superiores a 400m"
 
-#: planner.c:1057
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Gás inválido na coluna %d"
 
-#: planner.c:1145
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Hora de início inválida"
 
-#: webservice.c:25
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Identificação de utilizador inválida !"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Jan"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:1064
+#: print.c:985
+msgid "Layout Options"
+msgstr ""
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel y otros, 2011, 2012, 2013"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Lista"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Litro"
 
-#: divelist.c:1436 info.c:621 info.c:772 info.c:1247 print.c:487
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Localização"
 
-#: gtk-gui.c:1358
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Registos"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Mais Prolongado"
 
-#: statistics.c:793
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Mergulho mais prolongado"
 
@@ -1014,19 +1081,31 @@ msgstr "Alerta de Bateria Baixa"
 msgid "Low Battery Warning"
 msgstr "Advertência de Bateria Baixa"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr ""
+
+#: main.c:77
 msgid "Mar"
 msgstr "Mar"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr ""
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Marcar localização aquí"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr ""
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Marcador"
 
-#: print.c:486
+#: print.c:502
 msgid "Master"
 msgstr "Guía"
 
@@ -1034,133 +1113,135 @@ msgstr "Guía"
 msgid "Max Deco Time Warning"
 msgstr "Advertência de tempo máx deco"
 
-#: statistics.c:800 statistics.c:838
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Profundidade máx"
 
-#: statistics.c:808
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr ""
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Máx SAC"
 
-#: statistics.c:783
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Máx. Temp."
 
-#: print.c:103
+#: print.c:109
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Profundidade Máxima: %.*f %s\n"
-"Duração :%d minutos\n"
-"%s"
+msgstr "Profundidade Máxima: %.*f %s\nDuração :%d minutos\n%s"
 
-#: print.c:359
+#: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Máx. CNS"
 
-#: equipment.c:1454
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Press. máx."
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Máxima"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Máximo"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Máxima"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Maio"
 
-#: divelist.c:2372
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Juntar mergulhos"
 
-#: divelist.c:2413
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Integrar expedição à de cima"
 
-#: divelist.c:2423
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Integrar expedição à de baixo"
 
-#: gtk-gui.c:637
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Metro"
 
-#: statistics.c:801
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Profundidad mínima"
 
-#: statistics.c:809
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Mín SAC"
 
-#: statistics.c:784
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Mín Temp"
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Mínima"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Mínima"
 
-#: gtk-gui.c:703
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Opções diversas"
 
-#: gtk-gui.c:1268
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Modelo"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Seg"
 
-#: gtk-gui.c:1060
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "DiveLog multi-plataforma escrito em C "
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1363
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Novo"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Novo número de início"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Seguinte DC"
 
-#: gtk-gui.c:1278 gtk-gui.c:2003
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Nome"
 
@@ -1168,11 +1249,24 @@ msgstr "Nome"
 msgid "No Tank Data"
 msgstr "Sem dados registados da garrafa"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Notas"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
 msgstr "Nov"
 
@@ -1180,12 +1274,12 @@ msgstr "Nov"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1434 gtk-gui.c:730 print.c:343 statistics.c:855
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Out"
 
@@ -1193,19 +1287,32 @@ msgstr "Out"
 msgid "Odd pthread error return"
 msgstr "Erro \"pthread\" estranho"
 
-#: gtk-gui.c:1325
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Ok para remover entrada seleccionada ?"
 
-#: gtk-gui.c:276
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr ""
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Abrir Ficheiro"
 
-#: gtk-gui.c:1364
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Abrir..."
 
-#: print.c:167
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:173
 #, c-format
 msgid "Oxygen"
 msgstr "Oxigénio"
@@ -1226,63 +1333,86 @@ msgstr "Aviso de Ascenção PpO2"
 msgid "PO2 Green Warning"
 msgstr "Aviso Verde PpO2"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "PSI"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr ""
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Seleccionar no mapa"
 
-#: gtk-gui.c:1361
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Planeamento"
 
-#: gtk-gui.c:614
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr ""
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Preferências"
 
-#: gtk-gui.c:1373
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Preferências..."
 
-#: equipment.c:938 equipment.c:944
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Pressão"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Pressão:"
 
-#: gtk-gui.c:1387
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Anterior DC"
 
-#: print.c:932
+#: print.c:989
+msgid "Print in color"
+msgstr ""
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Imprimir apenas mergulhos seleccionados"
 
-#: print.c:927
+#: print.c:974
 msgid "Print selection"
 msgstr "Imprimir selecção"
 
-#: print.c:899
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Tipo de impressão"
 
-#: gtk-gui.c:1368
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Perfil"
 
-#: gtk-gui.c:740
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Ajustes de perfil"
 
-#: gtk-gui.c:1380
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Sair"
 
@@ -1294,7 +1424,7 @@ msgstr "Alerta de tempo de gás restante"
 msgid "RGT Warning"
 msgstr "Aviso tempo de gás restante"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Classificação"
 
@@ -1303,23 +1433,31 @@ msgstr "Classificação"
 msgid "Reading %s %s"
 msgstr "A ler %s %s"
 
-#: divelist.c:2084 divelist.c:2428
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr ""
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Eliminar expedição de mergulho"
 
-#: divelist.c:2507
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Eliminar mergulho da expedição"
 
-#: divelist.c:2505
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr ""
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Remover mergulhos da expedição seleccionada"
 
-#: gtk-gui.c:1003
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Alterar numeração"
 
-#: gtk-gui.c:1374
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Alterar numeração..."
 
@@ -1327,68 +1465,69 @@ msgstr "Alterar numeração..."
 msgid "Retry"
 msgstr "Repetir"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1433 gtk-gui.c:682 print.c:377 statistics.c:175 statistics.c:854
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1325
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC em paragem deco"
 
-#: planner.c:1324
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "SAC em fundo"
 
-#: file.c:75
-msgid "ZIP file"
-msgstr "Ficheiro ZIP "
-
 #: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Transgressão na paragem de segurança"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "Sáb"
 
-#: gtk-gui.c:1366
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: gtk-gui.c:206
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Guardar alterações?"
 
-#: divelist.c:1637 gtk-gui.c:143
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Guardar Ficheiro Como"
 
-#: divelist.c:2445
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Guardar como..."
 
-#: gtk-gui.c:1365
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Guardar..."
 
-#: planner.c:1217
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Duração do segmento"
 
-#: gtk-gui.c:952
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Seleccionar Eventos"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Seleccionar Eventos..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr ""
+
+#: main.c:78
 msgid "Sep"
 msgstr "Set"
 
@@ -1396,65 +1535,68 @@ msgstr "Set"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Escrita do ficheiro req.txt curta.\n"
-"Está Uemis Zúrich correctamente ligado?"
+msgstr "Escrita do ficheiro req.txt curta.\nEstá Uemis Zúrich correctamente ligado?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Mais curto"
 
-#: statistics.c:794
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Mergulho mais curto"
 
-#: gtk-gui.c:661 gtk-gui.c:724
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Mostrar Colunas"
 
-#: gtk-gui.c:820
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Mostrar PEA, PNE, EADD"
 
-#: gtk-gui.c:803
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Mostrar MOD"
 
-#: gtk-gui.c:836
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Mostrar o tecto calculado"
 
-#: gtk-gui.c:828
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Mostrar a vermelho o tecto reportado pelo dc"
 
-#: divelist.c:2478
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Mostrar no mapa"
 
-#: gtk-gui.c:786
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Mostrar gráfico de pHe"
 
-#: gtk-gui.c:767
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Mostrar gráfico de pN%s"
 
-#: gtk-gui.c:748
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Mostrar gráfico de pO%s"
 
-#: planner.c:243
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Mergulho simulado"
 
-#: equipment.c:935 equipment.c:1453
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Tamanho"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarme de Velocidade"
@@ -1463,7 +1605,7 @@ msgstr "Alarme de Velocidade"
 msgid "Speed Warning"
 msgstr "Advertência de velocidade"
 
-#: equipment.c:946 equipment.c:1455
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Início"
 
@@ -1471,54 +1613,63 @@ msgstr "Início"
 msgid "Start download"
 msgstr "Começar transferência"
 
-#: statistics.c:772
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: statistics.c:708
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Estatísticas %s"
 
-#: gtk-gui.c:1615
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Estatísticas"
 
-#: webservice.c:243
+#: webservice.c:295
 msgid "Status"
 msgstr "Estado"
 
-#: planner.c:575
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Permanecer a  %.*f %s durante %d:%02d min - runtime %d:%02u a %s\n"
 
-#: divelist.c:1430 gtk-gui.c:692 info.c:806 info.c:1259
+#: parse-xml.c:443
+#, c-format
+msgid "Strange percentage reading %s\n"
+msgstr ""
+
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Fato"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "Dom"
 
-#: statistics.c:832
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Interv. Superf."
 
-#: planner.c:1309
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Pressão atmosférica (mbar) "
 
-#: planner.c:586
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Alterar gás para %s\n"
 
-#: print.c:913
+#: print.c:960
 msgid "Table print"
 msgstr "Imprimir tabela"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr ""
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Sugestão de troca de garrafa"
@@ -1527,86 +1678,84 @@ msgstr "Sugestão de troca de garrafa"
 msgid "Tank Pressure Info"
 msgstr "Informação da pressão da garrafa"
 
-#: gtk-gui.c:722
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Definições técnicas"
 
-#: gtk-gui.c:667
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Todo"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Qui"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Tempo"
 
-#: gtk-gui.c:1501
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Para editar esta informação do mergulho\n"
-"seleccione-o na lista abaixo com duplo clique."
+msgstr "Para editar esta informação do mergulho\nseleccione-o na lista abaixo com duplo clique."
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Activar / Desactivar Zoom"
 
-#: planner.c:212
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Demasiadas misturas de gás"
 
-#: planner.c:1245
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Demasiados pontos na rota"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:791
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Tempo total"
 
-#: print.c:322
+#: print.c:340
 #, c-format
 msgid "Total Weight:"
 msgstr "Peso total:"
 
-#: planner.c:566
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u com %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:268
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Expedição %1$s, %2$s %3$d, %4$d (%5$d mergulho)"
 msgstr[1] "Viagem %1$s, %2$s %3$d, %4$d (%5$d mergulhos)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Ter"
 
-#: equipment.c:1452 equipment.c:1480
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Tipo"
 
@@ -1615,20 +1764,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: O sistema de ficheiros está quase cheio\n"
-"Desligue / religue o computador de mergulho\n"
-"e clique em \"Repetir\""
+msgstr "Uemis Zurich: O sistema de ficheiros está quase cheio\nDesligue / religue o computador de mergulho\ne clique em \"Repetir\""
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: sistema de ficheiros está cheio\n"
-"Desligue / religue o computador de mergulho\n"
-"e tentar novamente"
+msgstr "Uemis Zurich: sistema de ficheiros está cheio\nDesligue / religue o computador de mergulho\ne tentar novamente"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1648,111 +1791,119 @@ msgstr "Não é possivel criar o \"parser\" para %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Não se consegue abrir  %s %s (%s)"
 
-#: gtk-gui.c:630
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Unidades"
 
-#: gps.c:217
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr ""
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr ""
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr ""
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Usar clique direito para marcar no cursor a localização do mergulho"
 
-#: webservice.c:230
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Identificador de utilizador"
 
-#: gtk-gui.c:1359
+#: gtk-gui.c:1642
+msgid "User Manual"
+msgstr ""
+
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Ver"
 
-#: info.c:811 statistics.c:840
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Volume:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "O"
 
-#: planner.c:367
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Aviso - Mergulhos extremamente longos podem provocar tempos de cálculos demorados"
 
-#: planner.c:1073
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Aviso - Planear mergulhos muito profundos pode demorar demasiado tempo"
 
-#: statistics.c:846
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Temp. de Água"
 
-#: webservice.c:258
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Serviço web"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "Qua"
 
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:687
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Peso"
 
-#: equipment.c:1084 print.c:290
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Sistema de lastro"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Peso:"
 
-#: gtk-gui.c:131
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "Ficheiro XML "
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Ano"
 
-#: gtk-gui.c:1375 statistics.c:383
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Estatísticas anuais"
 
-#: gtk-gui.c:1989
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Tem já um computador de mergulho deste modelo\n"
-"chamado %s\n"
-" Subsurface pode manter um diminutivo para este aparelho para o distinguir do já existente. Por omissão o modelo e identificador do aparelho usado é como mostrado em baixo.\n"
-"Se não pretender atribuir um nome a este computador de mergulho, seleccione 'Cancelar'. Subsurface irá simplesmente mostrar como nome, o seu modelo (isto significa que não terá meio de distinguir ambos no registo de mergulho)."
+msgstr "Tem já um computador de mergulho deste modelo\nchamado %s\n Subsurface pode manter um diminutivo para este aparelho para o distinguir do já existente. Por omissão o modelo e identificador do aparelho usado é como mostrado em baixo.\nSe não pretender atribuir um nome a este computador de mergulho, seleccione 'Cancelar'. Subsurface irá simplesmente mostrar como nome, o seu modelo (isto significa que não terá meio de distinguir ambos no registo de mergulho)."
 
-#: gtk-gui.c:216
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Existem alterações ainda não gravadas\n"
-"Deseja as guardar antes de fechar o ficheiro de dados ?"
+msgstr "Existem alterações ainda não gravadas\nDeseja as guardar antes de fechar o ficheiro de dados ?"
 
-#: gtk-gui.c:219 gtk-gui.c:222
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Existem alterações por guardar no ficheiro: %s \n"
-"Deseja guardar antes de fechar o ficheiro de dados ?"
+msgstr "Existem alterações por guardar no ficheiro: %s \nDeseja guardar antes de fechar o ficheiro de dados ?"
 
-#: divelist.c:544 planner.c:124 planner.c:790 planner.c:791 print.c:172
-#: profile.c:399
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "ar"
@@ -1761,7 +1912,11 @@ msgstr "ar"
 msgid "airtime"
 msgstr "tempo de ar"
 
-#: equipment.c:828
+#: statistics.c:21
+msgid "altitude"
+msgstr ""
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "tornozelo"
 
@@ -1769,22 +1924,34 @@ msgstr "tornozelo"
 msgid "ascent"
 msgstr "subida"
 
-#: equipment.c:829
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "lastro no arnês"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:827
+#: equipment.c:891
 msgid "belt"
 msgstr "cinto"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr ""
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "favorito"
 
+#: statistics.c:21
+msgid "cave"
+msgstr ""
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "tecto"
@@ -1793,11 +1960,11 @@ msgstr "tecto"
 msgid "ceiling (safety stop)"
 msgstr "tecto (paragem de segurança)"
 
-#: equipment.c:830
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:958
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "pés^3"
 
@@ -1809,6 +1976,10 @@ msgstr "dados"
 msgid "deco stop"
 msgstr "paragem de deco"
 
+#: statistics.c:20
+msgid "deep"
+msgstr ""
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "paragem de profundidade"
@@ -1825,40 +1996,48 @@ msgstr "identificação do local de mergulho"
 msgid "divetime"
 msgstr "duração do mergulho"
 
+#: statistics.c:20
+msgid "drift"
+msgstr ""
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "fato seco"
 
-#: planner.c:792
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:681
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "para todos os mergulhos"
 
-#: statistics.c:677
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "para mergulho #%d -"
 
-#: statistics.c:636
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "para mergulhos #"
 
-#: statistics.c:679
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "para mergulho seleccionado"
 
-#: statistics.c:643
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "para mergulhos seleccionados"
 
-#: dive.c:117 divelist.c:1426 info.c:1178 planner.c:896
+#: statistics.c:22
+msgid "freshwater"
+msgstr ""
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "pés"
 
@@ -1874,10 +2053,18 @@ msgstr "mudança de gás"
 msgid "heading"
 msgstr "cabeçalho"
 
-#: equipment.c:826
+#: statistics.c:21
+msgid "ice"
+msgstr ""
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integrado"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr ""
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "Número de evento inválido"
@@ -1886,15 +2073,19 @@ msgstr "Número de evento inválido"
 msgid "jacket"
 msgstr "colete"
 
-#: dive.c:141 equipment.c:1004 gtk-gui.c:657
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1429 equipment.c:1006 gtk-gui.c:658
+#: statistics.c:21
+msgid "lake"
+msgstr ""
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "libra"
 
@@ -1902,15 +2093,15 @@ msgstr "libra"
 msgid "long john"
 msgstr "long john"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "máx ppO2"
 
-#: divelist.c:1435 gtk-gui.c:735
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "máxCNS"
 
@@ -1922,7 +2113,7 @@ msgstr "Profundidade Máx"
 msgid "membrane"
 msgstr "membrana"
 
-#: divelist.c:1427 planner.c:964
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1935,11 +2126,15 @@ msgstr "modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "mais dados do identificador de mergulho"
 
-#: statistics.c:515
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "mais de %d dias"
 
+#: statistics.c:22
+msgid "night"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "tempo sem paragem"
@@ -1948,25 +2143,33 @@ msgstr "tempo sem paragem"
 msgid "none"
 msgstr "nenhum"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "limiar de pHe"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "limiar de pN%s"
 
-#: gtk-gui.c:754
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "limiar de pO%s"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr ""
+
+#: statistics.c:21
+msgid "pool"
+msgstr ""
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1978,6 +2181,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "paragem de segurança"
@@ -1994,6 +2201,10 @@ msgstr "paragem de segurança (voluntária)"
 msgid "semidry"
 msgstr "semiseco"
 
+#: statistics.c:20
+msgid "shore"
+msgstr ""
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "shorty"
@@ -2002,31 +2213,34 @@ msgstr "shorty"
 msgid "surface"
 msgstr "superfície"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr ""
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Alarme do nível nos tecidos"
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1066
-msgid "translator-credits"
+#: statistics.c:22
+msgid "training"
 msgstr ""
-"José Ángel Tortosa Delfa\n"
-"Pablo García Castro\n"
-"Matthias Kaehlcke\n"
-"Sergio Schvezov\n"
-"Auni Somero\n"
-"Henrik Brautaset Aronsen (who doesn't speak Spanish)\n"
-"and Salvador Cuñat"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
+msgid "translator-credits"
+msgstr "José Ángel Tortosa Delfa\nPablo García Castro\nMatthias Kaehlcke\nSergio Schvezov\nAuni Somero\nHenrik Brautaset Aronsen (who doesn't speak Spanish)\nand Salvador Cuñat"
 
 #: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "transmissor"
 
-#: equipment.c:1345 equipment.c:1365
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "desc"
 
-#: libdivecomputer.c:152 print.c:303 statistics.c:561 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -2038,11 +2252,15 @@ msgstr "não especificado"
 msgid "vest"
 msgstr "camisola"
 
+#: statistics.c:23
+msgid "video"
+msgstr ""
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "transgressão"
 
-#: equipment.c:1481
+#: equipment.c:1545
 msgid "weight"
 msgstr "peso"
 
@@ -2054,57 +2272,6 @@ msgstr "fato húmido"
 msgid "workload"
 msgstr "carga"
 
-#~ msgid "About"
-#~ msgstr "Acerca de"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Automáticamente agrupar las inmersiones en viajes"
-
-#~ msgid "Delete"
-#~ msgstr "Eliminar"
-
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Profundidad\n"
-#~ "Promedio"
-
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Duración\n"
-#~ "Total"
-
-#~ msgid "Pretty print"
-#~ msgstr "Impresión gráfica"
-
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "SAC\n"
-#~ "Promedio"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "SAC|\n"
-#~ "Mínimo"
-
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Temperature\n"
-#~ "Promedio"
-
-#~ msgid "deco"
-#~ msgstr "deco"
+#: statistics.c:21
+msgid "wreck"
+msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 96224a91f..19a1c0674 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,31 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Sergey Starosek <sergey.starosek@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-04 18:56+0200\n"
-"PO-Revision-Date: 2013-03-04 20:27+0300\n"
-"Last-Translator: Sergey Starosek <sergey.starosek@gmail.com>\n"
-"Language-Team: Russian\n"
-"Language: ru\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/subsurface/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gtk-gui.c:1057
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Нет событий\n"
+msgstr "\nНет событий\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr "> Месяц"
 
-#: webservice.c:288
+#: webservice.c:289
 msgid " Download"
 msgstr "Загрузить"
 
@@ -33,17 +37,17 @@ msgstr "Загрузить"
 msgid " Please select dive computer and device. "
 msgstr "Выберите модель компьютера и устройство."
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr " начало"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr " конец"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "№"
 
@@ -57,52 +61,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/мин"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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$d:%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d мин"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dд %dч %dмин"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dч %dмин"
@@ -112,193 +117,167 @@ msgstr "%dч %dмин"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Расчетный потолок %.0f %s"
+msgstr "%s\nРасчетный потолок %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Деко:%uмин @ %.0f %s"
+msgstr "%s\nДеко:%uмин @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Деко:неизв. время @ %.0f %s"
+msgstr "%s\nДеко:неизв. время @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"В деко"
+msgstr "%s\nВ деко"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%uмин"
+msgstr "%s\nNDL:%uмин"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Ост.безоп:%uмин @ %.0f %s"
+msgstr "%s\nОст.безоп:%uмин @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Ост.безоп:неизв. время @ %.0f %s"
+msgstr "%s\nОст.безоп:неизв. время @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"План погружения Subsurface\n"
-"на основе значений нижний ГФ = %.0f и верхний ГФ = %.0f\n"
-"\n"
+msgstr "%s\nПлан погружения Subsurface\nна основе значений нижний ГФ = %.0f и верхний ГФ = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fбар"
+msgstr "%s\npHe:%.2fбар"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fбар"
+msgstr "%s\npN%s:%.2fбар"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fбар"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr "%s (событие в %d:%02u)"
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
 msgstr ""
-"%s\n"
-"pO%s:%.2fбар"
 
-#: dive.c:919
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) или (%s)"
 
-#: info.c:765
+#: info-gtk.c:491
 msgid "(click to edit date/time)"
 msgstr "(нажмите для редактирования даты/времени)"
 
-#: info.c:767
+#: info-gtk.c:493
 msgid "(click to edit date/time/depth)"
 msgstr "(нажмите для редактирования даты/времени/глубины)"
 
-#: statistics.c:689
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(нет погружений)"
 
-#: gtk-gui.c:2122
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(отсутствует)"
 
-#: planner.c:1321
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 куб.фут/мин"
 
-#: planner.c:1320
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 куб.фут/мин"
 
-#: planner.c:1326
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 л/мин"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 погр. на стр."
 
@@ -306,67 +285,78 @@ msgstr "2 погр. на стр."
 msgid "2 pcs full suit"
 msgstr "полный из 2-х"
 
-#: planner.c:1325
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 л/мин"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "3м шаг для расчетного потолка"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 погр. на стр."
 
-#: planner.c:1269
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
-msgstr ""
-"<small>Добавляйте сегменты ниже.\n"
-"Каждая строка - это часть планируемого погружения.\n"
-"Запись с глубиной, временем и смесью описывает сегмент, который заканчивается на заданной глубине, длится (если относительно, т.е. +3:30) либо заканчивается (если абсолютно) в указанное время, и использует указанную смесь.\n"
-"Строка без указания смеси означает использование предыдущей смеси (или воздуха, если смесь не была указана).\n"
-"Строка с указанными глубиной и смесью, но без времени, - особая; она сообщает планировщику, что данная смесь доступна при подъеме по достижении указанной глубины.\n"
-"Настройка СС помечает погружения с ИДА замкнутого цикла (ребризером), оставьте пустым для обычных погружений.</small>\n"
-
-#: planner.c:1195
+msgstr "<small>Добавляйте сегменты ниже.\nКаждая строка - это часть планируемого погружения.\nЗапись с глубиной, временем и смесью описывает сегмент, который заканчивается на заданной глубине, длится (указано относительное время, т.е. '+3:30') либо заканчивается (указано абсолютное время, т.е. '@5:00', 'runtime') в указанное время, и использует указанную смесь.\nЕсли смесь не указана, то будет использоваться предыдущая смесь (или воздух, если смесь не была задана).\nСтрока с указанными глубиной и смесью, но без времени, - особая; она сообщает планировщику, что данная смесь доступна при подъеме по достижении указанной глубины.\nНастройка СС помечает погружения с ребризером, оставьте пустым для обычных погружений.</small>\n"
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "воздух"
 
-#: gtk-gui.c:1151 gtk-gui.c:1503
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "О Subsurface"
 
-#: gtk-gui.c:1494
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr "Добавить"
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Добавить погружение..."
 
-#: divelist.c:2048
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr "Добавить событие \"закладка\""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Добавить погружение"
 
-#: divelist.c:2150
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr "Добавить событие \"замена смеси\""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr "Добавить событие \"замена смеси\" в %d:%02u"
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Добавить к поездке выше"
 
-#: planner.c:1345
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Добавить путевую точку"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Давл. возд."
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Темп. возд."
 
-#: info.c:859
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Темп. воздуха в %s"
@@ -383,74 +373,78 @@ msgstr "Апр"
 msgid "Aug"
 msgstr "Авг"
 
-#: gtk-gui.c:1517
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Автогруппировка"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr "Доступные смеси"
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Средняя"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Средняя"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Среднее"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Средняя"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Ср. глуб."
 
-#: info.c:1287
+#: info-gtk.c:929
 #, c-format
 msgid "Avg Depth (%s):"
 msgstr "Ср. глубина (%s):"
 
-#: statistics.c:818
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Сред. SAC"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Ср. темп."
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Ср. время"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Переход на Откр. Цикл"
 
-#: gtk-gui.c:718
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "Бар"
 
-#: info.c:845 info.c:1360 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Партнер"
 
-#: planner.c:1224
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "Настройка СС"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Не найдена смесь %d/%d"
 
-#: parse-xml.c:1636
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Невозможно открыть файл преобразования (%s)/%s"
@@ -463,80 +457,107 @@ msgstr "Отменено, выход..."
 msgid "Cancelled..."
 msgstr "Отменено..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr "Невозможно добавить \"замена смеси\""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Невозможно разобрать ответ!"
 
-#: gtk-gui.c:728
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Цельсий"
 
-#: gtk-gui.c:620
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Выберите XML файл по умолчанию"
 
-#: gtk-gui.c:2024
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Выберите XML файлы для импорта в текущий файл данных"
 
-#: gtk-gui.c:1489
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Закрыть"
 
-#: divelist.c:2168
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Свернуть все"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Ошибка соединения:"
 
-#: divelist.c:2140
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Создать поездку выше"
 
-#: gtk-gui.c:724
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "куб. фут"
 
-#: divelist.c:1422 gtk-gui.c:748
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Баллон"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Баллон"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Баллон планировщика"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Баллоны"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "Г:%.1f %s"
 
-#: planner.c:1281
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА БЮЛЬМАНА, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr "Ошибка соединения с БД '%s'.\n"
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr "Ошибка запроса к БД '%s'.\n"
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr "Ошибка запроса get_events в БД.\n"
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Дата"
 
-#: info.c:1179
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Дата и время"
 
-#: info.c:1189
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Дата:"
 
@@ -544,23 +565,23 @@ msgstr "Дата:"
 msgid "Dec"
 msgstr "Дек"
 
-#: gtk-gui.c:785
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "XML файл по умолчанию"
 
-#: gtk-gui.c:1436
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Удалить дайвкомпьютер"
 
-#: divelist.c:1896 divelist.c:1947 divelist.c:2035
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Удалить погружение"
 
-#: divelist.c:1898 divelist.c:2034
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Удалить погружения"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Глуб."
 
@@ -568,11 +589,11 @@ msgstr "Глуб."
 msgid "Depth Limit Exceeded"
 msgstr "Превышен лимит глубины"
 
-#: gtk-gui.c:712
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Глубина:"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Идентификатор"
 
@@ -580,13 +601,18 @@ msgstr "Идентификатор"
 msgid "Device or mount point"
 msgstr "Устройство или точка монтирования"
 
-#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min <trailing text>
-#: info.c:106
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr "Показывать ошибочные погружения"
+
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#. <trailing text>
+#: info.c:88
 #, c-format
 msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
 msgstr "Погружение №%1$d - %2$s %4$02d.%3$02d.%5$04d в %6$d:%7$02d %8$s"
 
-#: info.c:159 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Погр. №%d - "
@@ -596,23 +622,27 @@ msgstr "Погр. №%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Погружение %d: %s %d %04d"
 
-#: gtk-gui.c:2104
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Название дайвкомпьютера"
 
-#: gtk-gui.c:1735 info.c:1059 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Информация"
 
-#: gtk-gui.c:1727
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Погружение"
 
-#: planner.c:1292
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "План погружения - ЭТО ТОЛЬКО ИМИТАЦИЯ; НЕ ИСПОЛЬЗУЙТЕ ДЛЯ ПОГРУЖЕНИЯ"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr "Метки погружения"
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Время погр."
 
@@ -636,11 +666,11 @@ msgstr "Ошибка импорта данных погружения"
 msgid "Dive locations"
 msgstr "Места погружений"
 
-#: info.c:844
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Инструктор"
 
-#: planner.c:1314
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Начало погружения"
 
@@ -648,19 +678,19 @@ msgstr "Начало погружения"
 msgid "Dive#"
 msgstr "Погр#"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Шрифт списка"
 
-#: info.c:1359
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Инструктор"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Погружения"
 
-#: gtk-gui.c:1499
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Места погружений"
 
@@ -668,111 +698,123 @@ msgstr "Места погружений"
 msgid "Download From Dive Computer"
 msgstr "Загрузка из дайвкомпьютера"
 
-#: gtk-gui.c:1492
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Загрузка из дайвкомпьютера..."
 
-#: webservice.c:259
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Загрузка из вебсервиса"
 
-#: gtk-gui.c:1493
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Загрузка из вебсервиса..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Успешная загрузка!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Длительность"
 
-#: info.c:1266
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Длительность (мин)"
 
-#: info.c:654
+#: info.c:312
 msgid "E"
 msgstr "В"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1196
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1197
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:224
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Редактировать"
 
-#: gtk-gui.c:1509
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Список дайвкомпьютеров"
 
-#: gtk-gui.c:1368
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Редактирование названий дайвкомпьютеров"
 
-#: info.c:1003
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Редактирование поездки"
 
-#: divelist.c:2056
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Краткие данные о поездке"
 
-#: gtk-gui.c:1428
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Чтобы редактировать название компьютера, дважды щелкните мышью в поле названия"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Редактировать погружение"
 
-#: divelist.c:2089 divelist.c:2112
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Редактировать дату/время"
 
-#: divelist.c:2031
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Редактировать погружения"
 
-#: info.c:802
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Множественное редактирование"
 
-#: info.c:618
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Редактировать данные поездки"
 
-#: gtk-gui.c:1050
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
-msgstr "Разрешить / Запретить события"
+msgstr "Показать / скрыть события"
+
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr "Показать / скрыть метки"
 
-#: equipment.c:950 equipment.c:1457
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Конец"
 
-#: planner.c:1221
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Конечная глубина"
 
-#: webservice.c:274
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Введите идентификатор пользователя и нажмите 'Загрузить'. По окончании загрузки вы можете нажать 'Применить' чтобы внести изменения."
 
-#: gtk-gui.c:1731 info.c:879
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Снаряжение"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr "Ошибка"
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Ошибка получения солености воды"
@@ -822,35 +864,47 @@ msgstr "Событие: сис.время=%<PRId64>, уст.время=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Событие: ожидание действия пользователя"
 
-#: divelist.c:2164
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Развернуть все"
 
-#: gtk-gui.c:729
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr "Экспортировать как файл UDDF"
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr "Экспорт UDDF..."
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr "Экспорт погружения (-ий) в UDDF"
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Фаренгейт"
 
-#: gtk-gui.c:123
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Не получилось открыть %i файлов."
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Ошибка разбора '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Ошибка разбора '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Ошибка чтения '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Ошибка чтения '%s'.\n"
@@ -859,15 +913,15 @@ msgstr "Ошибка чтения '%s'.\n"
 msgid "Feb"
 msgstr "Фев"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "Фут"
 
-#: gtk-gui.c:1479
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Файл"
 
-#: gtk-gui.c:1482
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Фильтр"
 
@@ -879,23 +933,23 @@ msgstr "Принудительная загрузка всех погружен�
 msgid "Fri"
 msgstr "Птн"
 
-#: gtk-gui.c:940
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "верхний ГФ"
 
-#: planner.c:1337
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "верхний ГФ для плана"
 
-#: gtk-gui.c:930
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "нижний ГФ"
 
-#: planner.c:1336
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "нижний ГФ для плана"
 
-#: info.c:822
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (формат WGS84 или GPS)"
 
@@ -904,42 +958,42 @@ msgstr "GPS (формат WGS84 или GPS)"
 msgid "Gas Used"
 msgstr "Расход"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Расход"
 
-#: planner.c:1223
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Смесь"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Потребление смеси:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Смесь"
 
-#: gtk-gui.c:705
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Общие настройки"
 
-#: gtk-gui.c:1484
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Справка"
 
-#: webservice.c:295
+#: webservice.c:296
 msgid "Idle"
 msgstr "Простаивает"
 
-#: gtk-gui.c:1491
-msgid "Import XML File(s)..."
-msgstr "Импорт XML файла(-ов)..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr "Импорт файлов..."
 
-#: gtk-gui.c:1507
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Информация"
 
@@ -947,29 +1001,29 @@ msgstr "Информация"
 msgid "Init Communication"
 msgstr "Инициализация связи"
 
-#: gtk-gui.c:1512
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Ввести план"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Ошибка разбора глубины \"%s\""
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Ошибка - глубины более 400м не поддерживаются"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Неверная смесь в строке %d"
 
-#: planner.c:1150
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Неверное время старта"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Неверный идентификатор пользователя!"
 
@@ -986,32 +1040,36 @@ msgstr "Июл"
 msgid "Jun"
 msgstr "Июн"
 
-#: gtk-gui.c:1157
+#: print.c:985
+msgid "Layout Options"
+msgstr "Параметры макета"
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Линус Торвальдс, Дирк Хондел и другие, 2011, 2012, 2013"
 
-#: gtk-gui.c:1505
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Список"
 
-#: gtk-gui.c:723
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "Литр"
 
-#: divelist.c:1427 info.c:623 info.c:817 info.c:1354 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Местонахождение"
 
-#: gtk-gui.c:1480
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Журнал"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Максимум"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Самый долгий"
 
@@ -1023,7 +1081,7 @@ msgstr "Тревога: заряд батареи"
 msgid "Low Battery Warning"
 msgstr "Внимание: заряд батареи"
 
-#: gtk-gui.c:795
+#: gtk-gui.c:872
 msgid "Map provider"
 msgstr "Поставщик карт"
 
@@ -1031,10 +1089,18 @@ msgstr "Поставщик карт"
 msgid "Mar"
 msgstr "Мар"
 
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr "Пометить как ошибочное"
+
 #: gps.c:53
 msgid "Mark location here"
 msgstr "Пометить точку здесь"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr "Пометить как верное"
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Метка"
@@ -1047,20 +1113,20 @@ msgstr "Инструктор"
 msgid "Max Deco Time Warning"
 msgstr "Внимание: макс. время деко"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Макс. глуб."
 
-#: info.c:1276
+#: info-gtk.c:918
 #, c-format
 msgid "Max Depth (%s):"
 msgstr "Макс. глубина (%s):"
 
-#: statistics.c:816
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Макс. SAC"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Макс. темп."
 
@@ -1070,31 +1136,28 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Макс. глубина: %.*f %s\n"
-"Длительность: %d мин\n"
-"%s"
+msgstr "Макс. глубина: %.*f %s\nДлительность: %d мин\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Макс. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Макс. давл."
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Максимум"
@@ -1103,54 +1166,54 @@ msgstr "Максимум"
 msgid "May"
 msgstr "Май"
 
-#: divelist.c:2023
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Объединить погружения"
 
-#: divelist.c:2064
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Объединить с поездкой выше"
 
-#: divelist.c:2074
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Объединить с поездкой ниже"
 
-#: gtk-gui.c:713
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "Метр"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Мин. глуб."
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Мин. SAC"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Мин. темп."
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: gtk-gui.c:779
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Прочие настройки"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Модель"
 
@@ -1158,27 +1221,27 @@ msgstr "Модель"
 msgid "Mon"
 msgstr "Пнд"
 
-#: gtk-gui.c:1153
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Кроссплатформенный журнал погружений"
 
-#: info.c:653
+#: info.c:311
 msgid "N"
 msgstr "С"
 
-#: gtk-gui.c:1485
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Новый"
 
-#: gtk-gui.c:1105
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Начать нумерацию с"
 
-#: gtk-gui.c:1511
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "След. ДК"
 
-#: gtk-gui.c:1400 gtk-gui.c:2126
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Имя устройства"
 
@@ -1186,10 +1249,23 @@ msgstr "Имя устройства"
 msgid "No Tank Data"
 msgstr "Нет данных о баллоне"
 
-#: info.c:628 info.c:870 info.c:1368
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr "Для этого погружения не указаны баллоны."
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Примечания"
 
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr "Высота примечаний (%d%% - %d%%)"
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr "Примечания наверху"
+
 #: main.c:78
 msgid "Nov"
 msgstr "Ноя"
@@ -1198,7 +1274,7 @@ msgstr "Ноя"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:811 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
@@ -1211,18 +1287,31 @@ msgstr "Окт"
 msgid "Odd pthread error return"
 msgstr "Необычная ошибка возврата pthread"
 
-#: gtk-gui.c:1447
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Удалить выбранную запись?"
 
-#: gtk-gui.c:287
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr "Показывать только погружения с метками:"
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Открыть файл"
 
-#: gtk-gui.c:1486
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Открыть..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr "Макет страницы"
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr "Высота прочих данных (%d%% - %d%%)"
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1244,63 +1333,86 @@ msgstr "Внимание: PO2 при подъеме"
 msgid "PO2 Green Warning"
 msgstr "Внимание: PO2 (зеленый)"
 
-#: gtk-gui.c:719
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "PSI"
 
-#: info.c:833
+#: webservice.c:341
+msgid "Password"
+msgstr "Пароль"
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Выбрать на карте"
 
-#: gtk-gui.c:1483
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Планировщик"
 
-#: gtk-gui.c:690
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr "Укажите свой логин и пароль для divelogs.de. Выбранные погружения будут добавлены к вашей учетной записи."
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Предпочтения"
 
-#: gtk-gui.c:1495
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Предпочтения..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Давление"
 
-#: gtk-gui.c:717
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Давление:"
 
-#: gtk-gui.c:1510
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Пред. ДК"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr "Цветная печать"
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Печать выбранных погружений"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Печать выделенных"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
-msgstr "Тип печати"
+msgstr "Настройки печати"
 
-#: gtk-gui.c:1490
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Печать..."
 
-#: gtk-gui.c:1506
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Профиль"
 
-#: gtk-gui.c:821
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Настройки профиля"
 
-#: gtk-gui.c:1502
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr "Высота профиля (%d%% - %d%%)"
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr "Профиль наверху"
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Выход"
 
@@ -1312,7 +1424,7 @@ msgstr "Тревога: RGT"
 msgid "RGT Warning"
 msgstr "Внимание: RGT"
 
-#: info.c:850 info.c:1365
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Оценка"
 
@@ -1321,23 +1433,31 @@ msgstr "Оценка"
 msgid "Reading %s %s"
 msgstr "Чтение %s %s"
 
-#: divelist.c:1770 divelist.c:2079
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr "Удалить"
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Удалить поездку"
 
-#: divelist.c:2158
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Удалить из поездки"
 
-#: divelist.c:2156
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr "Удалить событие здесь"
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Удалить выделенные из поездки"
 
-#: gtk-gui.c:1096
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Перенумеровать"
 
-#: gtk-gui.c:1496
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Перенумеровать..."
 
@@ -1345,20 +1465,21 @@ msgstr "Перенумеровать..."
 msgid "Retry"
 msgstr "Повторить"
 
-#: info.c:653
+#: info.c:311
 msgid "S"
 msgstr "Ю"
 
-#: divelist.c:1424 gtk-gui.c:758 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1331
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC при декостоп"
 
-#: planner.c:1330
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "SAC при погружении"
 
@@ -1370,38 +1491,42 @@ msgstr "Нарушение остановки безопасности"
 msgid "Sat"
 msgstr "Суб"
 
-#: gtk-gui.c:1488
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: gtk-gui.c:217
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Сохранить изменения?"
 
-#: divelist.c:1626 gtk-gui.c:154
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Сохранить файл как"
 
-#: divelist.c:2096
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Сохранить как"
 
-#: gtk-gui.c:1487
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Сохранить..."
 
-#: planner.c:1222
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Время сегмента"
 
-#: gtk-gui.c:1041
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Выбрать события"
 
-#: gtk-gui.c:1501
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Выбрать события..."
 
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr "Выбрать метки..."
+
 #: main.c:78
 msgid "Sep"
 msgstr "Снт"
@@ -1410,65 +1535,68 @@ msgstr "Снт"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Прервана запись в файл req.txt\n"
-"Проверьте подключение Uemis Zurich."
+msgstr "Прервана запись в файл req.txt\nПроверьте подключение Uemis Zurich."
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Минимум"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Самый короткий"
 
-#: gtk-gui.c:737 gtk-gui.c:805
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Показать колонки"
 
-#: gtk-gui.c:901
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Показать EAD, END, EADD"
 
-#: gtk-gui.c:884
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Показать MOD"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Показать расчетный потолок"
 
-#: gtk-gui.c:909
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Показать потолок компьютера красным"
 
-#: divelist.c:2129
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Показать на карте"
 
-#: gtk-gui.c:867
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "График pHe"
 
-#: gtk-gui.c:848
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "График pN%s"
 
-#: gtk-gui.c:829
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "График pO%s"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Моделирование погружения"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Объем"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Тревога: скорость"
@@ -1477,7 +1605,7 @@ msgstr "Тревога: скорость"
 msgid "Speed Warning"
 msgstr "Внимание: скорость"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Начало"
 
@@ -1485,34 +1613,34 @@ msgstr "Начало"
 msgid "Start download"
 msgstr "Начать загрузку"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Статистика"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Статистика %s"
 
-#: gtk-gui.c:1739
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Статистика"
 
-#: webservice.c:294
+#: webservice.c:295
 msgid "Status"
 msgstr "Состояние"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Странное значение процентов %s\n"
 
-#: divelist.c:1421 gtk-gui.c:768 info.c:851 info.c:1366
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Костюм"
 
@@ -1521,23 +1649,27 @@ msgstr "Костюм"
 msgid "Sun"
 msgstr "Вск"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Пов. инт."
 
-#: planner.c:1315
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Давление на поверхности (мбар)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Замена смеси на %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Таблица"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr "Метки отображаются только если они одинаковые для всех редактируемых погружений"
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Предложена смена баллона"
@@ -1546,23 +1678,23 @@ msgstr "Предложена смена баллона"
 msgid "Tank Pressure Info"
 msgstr "Давление в баллоне"
 
-#: gtk-gui.c:803
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Техн. настройки"
 
-#: gtk-gui.c:743
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Темп."
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Температура"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Три панели"
 
@@ -1570,36 +1702,34 @@ msgstr "Три панели"
 msgid "Thu"
 msgstr "Чтв"
 
-#: info.c:1196
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Время"
 
-#: gtk-gui.c:1625
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Для редактирования погружения\n"
-"дважды щелкните мышью на нем в списке"
+msgstr "Для редактирования погружения\nдважды щелкните мышью на нем в списке"
 
-#: gtk-gui.c:1518
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Изменить масштаб"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Слишком много смесей"
 
-#: planner.c:1250
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Слишком много путевых точек"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Общая"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Общее время"
 
@@ -1608,13 +1738,13 @@ msgstr "Общее время"
 msgid "Total Weight:"
 msgstr "Общий вес:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
@@ -1626,7 +1756,7 @@ msgstr[2] "Trip %1$s, %3$d %2$s %4$d (%5$d погружений)"
 msgid "Tue"
 msgstr "Втр"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Тип"
 
@@ -1635,20 +1765,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: Файловая система почти заполнена\n"
-"Отсоедините и подключите дайв-компьютер\n"
-"и нажмите \"Повторить\""
+msgstr "Uemis Zurich: Файловая система почти заполнена\nОтсоедините и подключите дайв-компьютер\nи нажмите \"Повторить\""
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: Файловая система заполнена\n"
-"Отсоедините и подключите дайв-компьютер\n"
-"и попробуйте заново"
+msgstr "Uemis Zurich: Файловая система заполнена\nОтсоедините и подключите дайв-компьютер\nи попробуйте заново"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1668,51 +1792,63 @@ msgstr "Невозможно создать анализатор для %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Невозможно открыть %s %s (%s)"
 
-#: gtk-gui.c:706
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Единицы"
 
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr "Выгрузить погружение (-я) на divelogs.de"
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr "Выгрузить на divelogs.de"
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr "Выгрузить на divelogs.de..."
+
 #: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Для отметки нажмите правую кнопку мыши"
 
-#: webservice.c:281
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Идентификатор пользователя"
 
-#: gtk-gui.c:1504
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Руководство пользователя"
 
-#: gtk-gui.c:1481
+#: gtk-gui.c:1614
 msgid "View"
-msgstr "Просмотр"
+msgstr "Вид"
 
-#: info.c:856 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Видимость"
 
-#: gtk-gui.c:722
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Объем:"
 
-#: info.c:654
+#: info.c:312
 msgid "W"
 msgstr "З"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Внимание - расчет очень долгих погружений может занять много времени"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Внимание - расчет очень глубоких погружений может занять много времени"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Темп. воды"
 
-#: webservice.c:162
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Вебсервис"
 
@@ -1720,62 +1856,55 @@ msgstr "Вебсервис"
 msgid "Wed"
 msgstr "Срд"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:763
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Груз"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Грузовая система"
 
-#: gtk-gui.c:732
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Вес:"
 
-#: gtk-gui.c:142
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML файл"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Год"
 
-#: gtk-gui.c:1497 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Статистика за год"
 
-#: gtk-gui.c:2112
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"У вас уже есть дайвкомпьютер этой модели,\n"
-"который называется %s.Subsurface позволяет именовать компьютеры чтобы различать их. По умолчанию это модель и идентификатор, указанные ниже.\n"
-"Если вы не хотите именовать этот компьютер, нажмите 'Отмена' и Subsurface будет показывать его модель вместо имени (и вы не сможете отличить их друг от друга в журналах)."
+msgstr "У вас уже есть дайвкомпьютер этой модели,\nкоторый называется %s.Subsurface позволяет именовать компьютеры чтобы различать их. По умолчанию это модель и идентификатор, указанные ниже.\nЕсли вы не хотите именовать этот компьютер, нажмите 'Отмена' и Subsurface будет показывать его модель вместо имени (и вы не сможете отличить их друг от друга в журналах)."
 
-#: gtk-gui.c:227
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"У вас есть несохраненные изменения.\n"
-"Хотите ли вы их сохранить перед закрытием журнала?"
+msgstr "У вас есть несохраненные изменения.\nХотите ли вы их сохранить перед закрытием журнала?"
 
-#: gtk-gui.c:230 gtk-gui.c:233
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"У вас есть несохраненные изменения в файле %s.\n"
-"Хотите ли вы их сохранить перед закрытием журнала?"
+msgstr "У вас есть несохраненные изменения в файле %s.\nХотите ли вы их сохранить перед закрытием журнала?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "воздух"
@@ -1784,7 +1913,11 @@ msgstr "воздух"
 msgid "airtime"
 msgstr "оставшееся время по воздуху"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr "высокогорье"
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "груз на ноги"
 
@@ -1792,22 +1925,34 @@ msgstr "груз на ноги"
 msgid "ascent"
 msgstr "подъем"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "груз на пластину"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "Бар"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "пояс"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr "с лодки"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "закладка"
 
+#: statistics.c:21
+msgid "cave"
+msgstr "пещера"
+
+#: statistics.c:20
+msgid "cavern"
+msgstr "каверна"
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "потолок"
@@ -1816,11 +1961,11 @@ msgstr "потолок"
 msgid "ceiling (safety stop)"
 msgstr "потолок (остановка безопасности)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "карабины"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "куб. фут"
 
@@ -1832,6 +1977,10 @@ msgstr "данные"
 msgid "deco stop"
 msgstr "деко стоп"
 
+#: statistics.c:20
+msgid "deep"
+msgstr "глубокое"
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "глубокая остановка"
@@ -1848,40 +1997,48 @@ msgstr "ид. места погружения"
 msgid "divetime"
 msgstr "время погружения"
 
+#: statistics.c:20
+msgid "drift"
+msgstr "течение"
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "сухой"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "для всех погружений"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "для погружения №%d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "для погружений №"
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "для выбранного погружения"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "для выбранных погружений"
 
-#: dive.c:117 divelist.c:1417 info.c:1276 info.c:1287 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr "в пресной воде"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "фут"
 
@@ -1897,10 +2054,18 @@ msgstr "замена смеси"
 msgid "heading"
 msgstr "направление"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr "подледное"
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "интегрированный"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr "ошибочное"
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "неверный номер события"
@@ -1909,15 +2074,19 @@ msgstr "неверный номер события"
 msgid "jacket"
 msgstr "куртка"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:733
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "кг"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "л"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:734
+#: statistics.c:21
+msgid "lake"
+msgstr "в озере"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "фунт"
 
@@ -1925,15 +2094,15 @@ msgstr "фунт"
 msgid "long john"
 msgstr "комбинезон"
 
-#: dive.c:112 info.c:1276 info.c:1287
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "м"
 
-#: gtk-gui.c:889
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "макс. ppO2"
 
-#: divelist.c:1426 gtk-gui.c:816
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "макс.CNS"
 
@@ -1945,7 +2114,7 @@ msgstr "макс. глуб."
 msgid "membrane"
 msgstr "мембрана"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "мин"
 
@@ -1958,11 +2127,15 @@ msgstr "модель=%u (0x%08x), прошивка=%u (0x%08x), серийный
 msgid "more data dive id"
 msgstr "ид. дополнительных данных погружения"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "более %d дней"
 
+#: statistics.c:22
+msgid "night"
+msgstr "ночное"
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "время без остановки"
@@ -1971,25 +2144,33 @@ msgstr "время без остановки"
 msgid "none"
 msgstr "отсутствует"
 
-#: gtk-gui.c:872
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "порог pHe"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "порог pN%s"
 
-#: gtk-gui.c:835
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "порог pO%s"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "Па"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr "фото"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "бассейн"
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -2001,6 +2182,10 @@ msgstr "оставшееся время на дне"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr "в реке"
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "остановка безопасности"
@@ -2017,6 +2202,10 @@ msgstr "остановка безопасности (добровольно)"
 msgid "semidry"
 msgstr "полусухой"
 
+#: statistics.c:20
+msgid "shore"
+msgstr "с берега"
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "короткий"
@@ -2025,12 +2214,21 @@ msgstr "короткий"
 msgid "surface"
 msgstr "поверхность"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr "обучение"
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "насыщение тканей"
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1159
+#: statistics.c:22
+msgid "training"
+msgstr "тренировка"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
 msgstr "Sergey Starosek"
 
@@ -2038,11 +2236,12 @@ msgstr "Sergey Starosek"
 msgid "transmitter"
 msgstr "передатчик"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "неизв"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -2054,11 +2253,15 @@ msgstr "не указано"
 msgid "vest"
 msgstr "жилет"
 
+#: statistics.c:23
+msgid "video"
+msgstr "видео"
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "нарушение"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "вес"
 
@@ -2070,29 +2273,6 @@ msgstr "мокрый"
 msgid "workload"
 msgstr "нагрузка"
 
-#~ msgid "1 dive per page"
-#~ msgstr "1 погр. на стр."
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Автогруппировка погружений в поездке"
-
-#~ msgid "Delete"
-#~ msgstr "Удалить"
-
-#~ msgid "Dive details"
-#~ msgstr "Детали погружения"
-
-#~ msgid "Pretty print"
-#~ msgstr "Профиль"
-
-#~ msgid "Show Partial Pressure Graphs in Profile"
-#~ msgstr "Парциальное давление в профиле"
-
-#~ msgid "ZIP file"
-#~ msgstr "Файл ZIP"
-
-#~ msgid "pHe"
-#~ msgstr "pHe"
-
-#~ msgid "pO"
-#~ msgstr "pO"
+#: statistics.c:21
+msgid "wreck"
+msgstr "рэк"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index a8f35305b..468cfc211 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,38 +1,37 @@
-# Slovakian translations for Subsurface package
-# Slovakian messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# Dirk Hohndel <dirk@hohndel.org>, 2012.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# dirkhh <dirk@hohndel.org>, 2012
+# Dodiak <dodo.sk@gmail.com>, 2013
 # Jozef Ivanecký <dodo.sk@gmail.com>, 2012
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-26 08:55+0100\n"
-"Last-Translator: Jozef Ivanecký <dodo.sk@gmail.com>\n"
-"Language-Team: Slovakian\n"
-"Language: de\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/subsurface/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Bez záznamov\n"
+msgstr "\nBez záznamov\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Mesiac"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr "Načitať"
 
@@ -40,17 +39,17 @@ msgstr "Načitať"
 msgid " Please select dive computer and device. "
 msgstr "Voľba typu počítača a zariadia. "
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr "začiatok"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr "koniec"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "#"
 
@@ -64,52 +63,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s z %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %dh %dmin"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
@@ -119,185 +119,167 @@ msgstr "%dh %dmin"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Vypočítaná hladina %.0f %s"
+msgstr "%s\nVypočítaná hladina %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:%umin @ %.0f %s"
+msgstr "%s\nDeco:%umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deco:nezn. čas @ %.0f %s"
+msgstr "%s\nDeco:nezn. čas @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"In deco"
+msgstr "%s\nIn deco"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Bezpečnostná zastávka:%umin @ %.0f %s"
+msgstr "%s\nBezpečnostná zastávka:%umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Bezpečnostná zastávka:nezn. čas @ %.0f %s"
+msgstr "%s\nBezpečnostná zastávka:nezn. čas @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface plan ponoru\n"
-"zrátaný s  GFlow = %.0f a GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface plan ponoru\nzrátaný s  GFlow = %.0f a GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr "%s udalosť o %d:%02u"
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
 msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
 
-#: dive.c:918
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) alebo (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(klikni na zmenu dátumu/času)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(klikni na zmenu dátumu/času/hĺbky)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(žiadné ponory)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(nič)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 kubst/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 kubst/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 ponory na stránku"
 
@@ -305,67 +287,78 @@ msgstr "2 ponory na stránku"
 msgid "2 pcs full suit"
 msgstr "2 dielny oblek"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "3m krok pre výpočet hladiny"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 ponorov na stránku"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
-msgstr ""
-"<small>Pridaj segment.\n"
-"Každý riadok predstavuje časť plánovaného ponoru.\n"
-"Riadok s hĺbkou, časom a dýchacou zmesou popisuje segment, ktorý končí v zadanej hĺbke,  trvá zadaný čas (ak zadaný relatívne, napr. '+3:30') alebo končí v zadaný čas (ak zadaný absolútne), a používa zadanú zmes.\n"
-"Nezadaná zmes znamená 'použi predchádzajúcu zmes' (alebo vzduch, ak žiadna zmes nebola zadaná).\n"
-"Riadok, ktorý ma zadanú hĺbku a dýchaciu zmes, no nemá zadaný čas, je špeciálny; informuje plánovač, že daná zmes je plánovaná len pre výstup po dosiahnutí zadanej hĺbky.\n"
-"CC SetPoint špecifikuje CC (rebreather) ponory, čiže nevypĺňať pre OC.</small>\n"
-
-#: planner.c:1198
+msgstr "<small>Pridaj segment nižšie.\nKaždý riadok predstavuje časť plánovaného ponoru.\nRiadok s hĺbkou, časom a dýchacou zmesou popisuje segment, ktorý končí v zadanej hĺbke,  trvá zadaný čas (ak zadaný relatívne, napr. '+3:30') alebo končí v zadaný čas (ak zadaný absolútne, napr. '@5:00'), a používa zadanú zmes.\nNezadaná zmes znamená 'použi predchádzajúcu zmes' (alebo vzduch, ak žiadna zmes nebola zadaná).\nRiadok, ktorý ma zadanú hĺbku a dýchaciu zmes, no nemá zadaný čas, je špeciálny; informuje plánovač, že daná zmes je plánovaná len pre výstup po dosiahnutí zadanej hĺbky.\nCC SetPoint špecifikuje CC (rebreather) ponory, čiže nevypĺňať pre OC.</small>\n"
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "Vzduch"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "O Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr "Pridať"
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Pridať Ponor..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr ""
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Pridať ponor"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr ""
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr ""
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Pridať do akcie vyššie"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Pridaj zastávku"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Tlak vzduchu"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Teplota vzduchu"
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Teplota vzduchu v %s"
@@ -374,77 +367,86 @@ msgstr "Teplota vzduchu v %s"
 msgid "Always prefer downloaded dive"
 msgstr "Vždycky preferuje nahratý ponor"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "Apr"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Automatické zgrupovanie"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr ""
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Priemer"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Priemer"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Priemer"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Priemer"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Priemerná hĺbka"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Priem. hĺbka (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Priemerná spotreba"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Priemerná teplota"
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Priemerný čas"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Záchrana na OC"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Partner"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC SetPoint"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Neviem nájsť zmes %d/%d"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Nemôžem otvoriť stylesheet (%s)/%s"
@@ -457,121 +459,143 @@ msgstr "Zrušené, korektne ukončenie..."
 msgid "Cancelled..."
 msgstr "Zrušené..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr ""
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Nemôžem spracovať odpoveď!"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Vyber default XML súbor"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 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:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Zredukovať všetky"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Pripájam..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Chyba spojenia"
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Vytvoriť novú akciu nad"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "kubická stopa"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Fľaša"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Fľaša"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Fľaša pre plánovanie"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Fľaše"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "H:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "VAROVANIE: TOTO JE NOVÁ IMPLEMENTÁCIA BUHLMANOVHO ALGORITMU A NA ŇOM IMPLEMENTOVANÝ PLÁNOVAČ PONOROV, KTORÝ VŠAK BOL MINIMÁLNE TESTOVANÝ. V ŽIADNOM PRÍPADE SA NEDOPORUČUJE PLÁNOVAŤ SKUTOČNÉ PONORY LEN POMOCOU TOHTO PROGRAMU."
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr "Spojenie s databázou zlýhalo '%s'.\n"
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr "Požiadavka na databázu zlyhala '%s'.\n"
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr ""
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Dátum"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Dátum a čas"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Dátum:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "Dec"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Default XML Súbor"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Zmaž údaje o počítači"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Zmazať ponor"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Zmazať ponory"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Hĺbka"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Hĺbka (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Prekročená Maximálna Hĺbka"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Hĺbka:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Id zariadenia"
 
@@ -579,13 +603,18 @@ msgstr "Id zariadenia"
 msgid "Device or mount point"
 msgstr "Zariadenie alebo bod pripojenia"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr "Zobraz neplatné ponory"
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Ponor #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Ponor #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Ponor #%d - "
@@ -595,23 +624,27 @@ msgstr "Ponor #%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Ponor #%d: %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Voliteľný názov počítača"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Informácie"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Poznámky"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Plán ponoru - TOTO JE LEN SIMULÁCIA; NEPOUŽÍVAJ NA POTÁPANIE"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr "Označenia ponorov"
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Čas Ponoru"
 
@@ -631,15 +664,15 @@ msgstr "Počítač - výrobca a produkt"
 msgid "Dive data import error"
 msgstr "Chyba importu dát"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Miesto ponoru"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Divemaster"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "Začiatok ponoru?"
 
@@ -647,19 +680,19 @@ msgstr "Začiatok ponoru?"
 msgid "Dive#"
 msgstr "Ponor č."
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Font pre ponory"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Ponory"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Miesta ponorov"
 
@@ -667,111 +700,123 @@ msgstr "Miesta ponorov"
 msgid "Download From Dive Computer"
 msgstr "Nahratie údajov z počítača"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Nahratie údajov z počítača..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Nahratie údajov z internetu"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Nahratie údajov z internetu..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Nahrávanie úspešne ukončené!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Dĺžka (min)"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Dĺžka (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "E"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Editovať"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Edituj názov zariadenia"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Zmena voliteľného mena počítača"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Editovať akciu"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Editovať sumár"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Zmeň voliteľný názov počítača dvojitým kliknutím na jeho meno"
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Editovať ponor"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Editovať dátum/čas"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Editovať ponory"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Editovať viac ponorov"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Editovať sumár"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Povolit / zakázať udalosti"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr "Povoľ / Zakaž označenia"
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Koniec"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Cieľová hĺbka"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Zadaj identifikačné údaje užívateľa a použi 'Download'. Po ukončení nahrávania údajov môžeš použiť 'Apply' ak si praješ aplikovať zmeny."
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Výstroj"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Chyba získania slanosti vody"
@@ -821,52 +866,64 @@ msgstr "Udalosť: systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Udalosť: Čakanie na vstup uživateľa"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Expandovať všetky"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr "Exportuj ako UDDF súbor"
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr "UDDF export ..."
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr "Exportuj ponor(y) do UDDF"
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Chyba pri otváraní %i súborov"
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Chyba pri spracovaní '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Chyba pri spracovaní '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Chyba pri načítaní '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Chyba pri načítaní '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "stopa"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Súbor"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filter"
 
@@ -874,27 +931,27 @@ msgstr "Filter"
 msgid "Force download of all dives"
 msgstr "Vynútiť načítanie všetkých ponorov"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "Pi"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh pre plán"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow pre plán"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (WGS84 alebo GPS format)"
 
@@ -903,42 +960,42 @@ msgstr "GPS (WGS84 alebo GPS format)"
 msgid "Gas Used"
 msgstr "Použitá zmes"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Použitá zmes"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Použitá zmes"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Spotreba plynu:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Zmes"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Všeobecné nastavenia"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Pomoc"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "Nečinnosť"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Import XML súboru..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr "Importuj súbor(y)..."
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Info"
 
@@ -946,71 +1003,75 @@ msgstr "Info"
 msgid "Init Communication"
 msgstr "Inicializácia komunikácie"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Plánovanie"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Neplatná hĺbka - nemožnosť spracovať \"%s\""
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Neplatná hĺbka - hodnoty pod 400m nie sú podporované"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Neplatná zmes na riadku %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Neplatný čas začiatku"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Neplatný identifikátor užívateľa!"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "Jan"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr "Možnosti rozmiestnenia"
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel a ďalší, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Zoznam"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Miesto"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Najdlhší"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Najdlhší ponor"
 
@@ -1022,14 +1083,26 @@ msgstr "Alarm: Slabá batéria"
 msgid "Low Battery Warning"
 msgstr "Upozornenie: Slabá batéria"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Zdroj máp"
+
+#: main.c:77
 msgid "Mar"
 msgstr "Mar"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr "Označ ako neplatný"
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Označ pozíciu"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr "Označ ako platný"
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "Značka"
@@ -1042,15 +1115,20 @@ msgstr "Master"
 msgid "Max Deco Time Warning"
 msgstr "Upozornenie: Max. dekompresný čas"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Max. hĺbka"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Max. hĺbka (%s):"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Max. spotreba"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Max. teplota"
 
@@ -1060,115 +1138,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Max. hĺbka: %.*f %s\n"
-"Dĺžka: %d min\n"
-"%s"
+msgstr "Max. hĺbka: %.*f %s\nDĺžka: %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Max. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Max. tlak"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "Máj"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Zlučiť ponory"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Spoj akciu s akciou nad"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Spoj akciu s akciou pod"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Min. hĺbka"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Min. spotreba"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min. teplota"
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Rôzne voľby"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Model"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "Po"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Multiplatformový SW na správu ponorov v C"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Nový"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Nové začiatočné číslo"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Nasledujúci DC"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Voliteľný názov"
 
@@ -1176,11 +1251,24 @@ msgstr "Voliteľný názov"
 msgid "No Tank Data"
 msgstr "Žiadne informácie o fľaši"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr ""
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Poznámky"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr ""
+
+#: main.c:78
 msgid "Nov"
 msgstr "Nov"
 
@@ -1188,12 +1276,12 @@ msgstr "Nov"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "Okt"
 
@@ -1201,18 +1289,31 @@ msgstr "Okt"
 msgid "Odd pthread error return"
 msgstr "Nešpecifikovaná PTHREAD chyba"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Môžem zmazať položku?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr "Zobraz ponory s nasledujúcimi označeniami:"
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Otvoriť súbor"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Otvoriť..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr ""
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr ""
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1234,63 +1335,86 @@ msgstr "PO2 Upozornenie: Výstup"
 msgid "PO2 Green Warning"
 msgstr "PO2 Upozornenie: Zelená"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "psi"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr "Heslo"
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Vyber na mape"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Plánovač"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr "Zadaj užívateľské meno a heslo pre divelogs.de. Vybrané ponory budú pridané k Tvojmu účtu"
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Nastavenia..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Tlak"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Tlak:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Predchádzajúci DC"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr "Farebná tlač"
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Tlačiť vybrané ponory"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Tlačiť výber"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Druh tlače"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Tlačiť..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Nastavenia profilu"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr ""
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr ""
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Koniec"
 
@@ -1302,7 +1426,7 @@ msgstr "Alarm: zostávajúci čas plynu"
 msgid "RGT Warning"
 msgstr "Upozornenie: zostávajúci čas plynu"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Hodnotenie"
 
@@ -1311,23 +1435,31 @@ msgstr "Hodnotenie"
 msgid "Reading %s %s"
 msgstr "Načítavam %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr "Zmaž"
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Vymaž akciu"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Vymaž ponor z akcie"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr "Zmaž túto udalosť"
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Vymaž vybrané ponory z akcie"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Prečíslovanie"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Prečíslovanie..."
 
@@ -1335,20 +1467,21 @@ msgstr "Prečíslovanie..."
 msgid "Retry"
 msgstr "Skús znovu"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "Spotreba plynu"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC počas dekompresnej zastávky"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "SAC počas ponoru"
 
@@ -1356,43 +1489,47 @@ msgstr "SAC počas ponoru"
 msgid "Safety Stop Violation"
 msgstr "Nedodržaná bezpečnostná zastávka"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "So"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Uložiť zmeny?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Uložiť súbor ako"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Uložiť ako"
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Uložiť..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Časový segment"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Voľba udalosti"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Voľba udalosti..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr "Zvoľ označenia..."
+
+#: main.c:78
 msgid "Sep"
 msgstr "Sep"
 
@@ -1400,65 +1537,68 @@ msgstr "Sep"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Čiastočný zápis do req.txt súboru\n"
-"Je Uemis Zurich korektne pripojený?"
+msgstr "Čiastočný zápis do req.txt súboru\nJe Uemis Zurich korektne pripojený?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Najkratší"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Najkratší ponor"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Zobraz stĺpce"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Zobraz EAD, END, EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Zobraz MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Zobraz vypočítanú hladinu"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Zobraz počítačom hlásenú hladinu červenou"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Zobraz na mape"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Zobraz pHe graf"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Zobraz pN%s graf"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Zobraz pO%s graf"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Simulovaný Ponor"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Veľkosť"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: Rýchlosť"
@@ -1467,7 +1607,7 @@ msgstr "Alarm: Rýchlosť"
 msgid "Speed Warning"
 msgstr "Upozornenie: Rýchlosť"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Štart"
 
@@ -1475,59 +1615,63 @@ msgstr "Štart"
 msgid "Start download"
 msgstr "Začať nahrávanie"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Štatistika"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Štatistika %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Štatistiky"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Stav"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Zvláštne percenta v %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Oblek"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "Ne"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Povrchový interval"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Tlak na hladine (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Zmena plynu na %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Tlač tabuľky"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr "Označenia sú zobrazené len ak sú identické pre všetky editované ponory"
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Odporúčaná zmena fľaše"
@@ -1536,60 +1680,58 @@ msgstr "Odporúčaná zmena fľaše"
 msgid "Tank Pressure Info"
 msgstr "Info: Tlak vo fľaši"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Tec nastavenia"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Teplota"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Teplota"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Teplota:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Kombinovaný"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "Št"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Čas"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
-msgstr ""
-"Na editovanie informácii o ponore\n"
-"klikni 2x na ponor v zozname"
+msgstr "Na editovanie informácii o ponore\nklikni 2x na ponor v zozname"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Zmeň veľkosť"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "Príliš veľa zmesí"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "Príliš veľa zastávok"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Celkový čas"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Celkový čas"
 
@@ -1598,24 +1740,25 @@ msgstr "Celkový čas"
 msgid "Total Weight:"
 msgstr "Celková hmotnosť:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
-msgstr[0] "Akcia %1$s, %2$s %3$d, %4$d (%5$d ponor)"
-msgstr[1] "Akcia %1$s, %2$s %3$d, %4$d (%5$d ponorov)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "Ut"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Typ"
 
@@ -1624,20 +1767,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: Súborovy systém takmer plný\n"
-"Odpoj/znovu pripoj počítač\n"
-"a klikni na 'Retry'"
+msgstr "Uemis Zurich: Súborovy systém takmer plný\nOdpoj/znovu pripoj počítač\na klikni na 'Retry'"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: Súborový systém plný\n"
-"Odpoj a znovu pripoj počítač\n"
-"a skus znovu"
+msgstr "Uemis Zurich: Súborový systém plný\nOdpoj a znovu pripoj počítač\na skus znovu"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1657,115 +1794,119 @@ msgstr "Nie je možné spracovať %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Nie je možné otvoriť %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Jednotky"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr "Nahraj ponor(y) na divelogs.de"
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr "Nahraj na divelogs.de"
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr "Nahraj na divelogs.de..."
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Použi pravé tlačidlo na označenie miesta ponor pod kurzorom"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Identifikátor Uživateľa"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Užívateľská príručka"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Náhľad"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Viditeľnosť"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Objem:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "W"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Upozornenie - príliš dlhý ponor, výpočet môže trvať dlhšie"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Upozornenie - príliš hlboký ponor, môže trvať príliš dlho"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Teplota vody"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Webservis"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "St"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Závažie"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Závažie"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Závažie:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML súbor"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "Rok"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Ročná štatistika"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Už máš jeden počítač tohto druhu\n"
-"pomenovaný ako %s\n"
-"Subsurface vie pracovať s voliteľnými menami pre rovnaké typy počítačov, aby bolo možné ich navzájom oddeliť. Prednastavený je model s identifikáciou zobrazený nižšie.\n"
-"Ak nechceš pomenovať tento počítač, klikni na 'Cancel' a Subsurface jednoducho zobrazí model počítača ako jeho meno (čo môže znamenať, že budeš mať problém identifikovať počítač medzi záznamami o ponoroch)."
+msgstr "Už máš jeden počítač tohto druhu\npomenovaný ako %s\nSubsurface vie pracovať s voliteľnými menami pre rovnaké typy počítačov, aby bolo možné ich navzájom oddeliť. Prednastavený je model s identifikáciou zobrazený nižšie.\nAk nechceš pomenovať tento počítač, klikni na 'Cancel' a Subsurface jednoducho zobrazí model počítača ako jeho meno (čo môže znamenať, že budeš mať problém identifikovať počítač medzi záznamami o ponoroch)."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Máš neuložené zmeny.\n"
-"Chceš ich uložiť pred zatvorením súboru?"
+msgstr "Máš neuložené zmeny.\nChceš ich uložiť pred zatvorením súboru?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Máš neuložené zmeny v súbore %s \n"
-"Chceš ich uložiť pred zatvorením súboru?"
+msgstr "Máš neuložené zmeny v súbore %s \nChceš ich uložiť pred zatvorením súboru?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "vzduch"
@@ -1774,7 +1915,11 @@ msgstr "vzduch"
 msgid "airtime"
 msgstr "čas na vzduchu"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr "výškovy"
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "členok"
 
@@ -1782,22 +1927,34 @@ msgstr "členok"
 msgid "ascent"
 msgstr "výstup"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "backplate závažie"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "opasok"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr "z lode"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "poznámka"
 
+#: statistics.c:21
+msgid "cave"
+msgstr "jaskyňa"
+
+#: statistics.c:20
+msgid "cavern"
+msgstr ""
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "strop"
@@ -1806,11 +1963,11 @@ msgstr "strop"
 msgid "ceiling (safety stop)"
 msgstr "strop (bezpečnostná zastávka)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "cuft"
 
@@ -1822,6 +1979,10 @@ msgstr "data"
 msgid "deco stop"
 msgstr "dekompresná zastávka"
 
+#: statistics.c:20
+msgid "deep"
+msgstr "hlboký"
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "hĺbková zastávka"
@@ -1838,40 +1999,48 @@ msgstr "id dát miesta ponoru"
 msgid "divetime"
 msgstr "čas ponoru"
 
+#: statistics.c:20
+msgid "drift"
+msgstr "prúdový"
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "suchý oblek"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "pre všetky ponory"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "pre ponor #%d"
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "pre ponory"
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "pre vybraný ponor"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "pre vybrané ponory"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr "sladká voda"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1887,10 +2056,18 @@ msgstr "zmena plynu"
 msgid "heading"
 msgstr "smer"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr "ľad"
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integrované"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr "neplatný"
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "neplatné číslo udalosti"
@@ -1899,15 +2076,19 @@ msgstr "neplatné číslo udalosti"
 msgid "jacket"
 msgstr "vesta"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr "jazero"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "US libra"
 
@@ -1915,15 +2096,15 @@ msgstr "US libra"
 msgid "long john"
 msgstr "long john"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "max. ppO2"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "max. CNS"
 
@@ -1935,7 +2116,7 @@ msgstr "max. hĺbka"
 msgid "membrane"
 msgstr "membrana"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "min"
 
@@ -1948,11 +2129,15 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "id ďalších dát ponoru"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "viac než %d dní"
 
+#: statistics.c:22
+msgid "night"
+msgstr "nočný"
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "non stop čas"
@@ -1961,25 +2146,33 @@ msgstr "non stop čas"
 msgid "none"
 msgstr "žiaden"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "pHe hranica"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "pN%s hranica"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "pO%s hranica"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr "fotenie"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "bazén"
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1991,6 +2184,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr "rieka"
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "bezpečnostná zastávka"
@@ -2007,6 +2204,10 @@ msgstr "bezpečnostná zastávka (dobrovoľná)"
 msgid "semidry"
 msgstr "polosuchý"
 
+#: statistics.c:20
+msgid "shore"
+msgstr "z brehu"
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "krátky"
@@ -2015,12 +2216,21 @@ msgstr "krátky"
 msgid "surface"
 msgstr "povrch"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr "výuka"
+
 #: libdivecomputer.c:154
 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:1075
+#: statistics.c:22
+msgid "training"
+msgstr "tréning"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
 msgstr "Jozef (Ďoďo) Ivanecký"
 
@@ -2028,11 +2238,12 @@ msgstr "Jozef (Ďoďo) Ivanecký"
 msgid "transmitter"
 msgstr "vysielač"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "nez."
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "neznámy"
 
@@ -2044,11 +2255,15 @@ msgstr "nešpecifikovaný"
 msgid "vest"
 msgstr "vesta"
 
+#: statistics.c:23
+msgid "video"
+msgstr "kamera"
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "prekročenie"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "hmotnosť"
 
@@ -2060,67 +2275,6 @@ msgstr "neoprén"
 msgid "workload"
 msgstr "záťaž"
 
-#~ msgid "About"
-#~ msgstr "Info"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Automatické zrgupovanie do akcii"
-
-#~ msgid "Delete"
-#~ msgstr "Zmazať"
-
-#, fuzzy
-#~ msgctxt "Depth"
-#~ msgid ""
-#~ "Depth\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Priemerná\n"
-#~ "Hĺbka"
-
-#~ msgid "Dive details"
-#~ msgstr "Detaily ponoru"
-
-#, fuzzy
-#~ msgctxt "Duration"
-#~ msgid ""
-#~ "Duration\n"
-#~ "Total"
-#~ msgstr ""
-#~ "Dĺžka\n"
-#~ "Celková"
-
-#~ msgid "Pretty print"
-#~ msgstr "Pekná tlač"
-
-#, fuzzy
-#~ msgctxt "SAC"
-#~ msgid ""
-#~ "SAC\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Priemerná\n"
-#~ "spotreba plynu"
-
-#, fuzzy
-#~ msgid ""
-#~ "SAC|\n"
-#~ "Minimum"
-#~ msgstr ""
-#~ "\n"
-#~ "Minimum"
-
-#, fuzzy
-#~ msgctxt "Temp"
-#~ msgid ""
-#~ "Temperature\n"
-#~ "Average"
-#~ msgstr ""
-#~ "Teplota\n"
-#~ "Priemer"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP súbor"
-
-#~ msgid "deco"
-#~ msgstr "dekompresia"
+#: statistics.c:21
+msgid "wreck"
+msgstr "vrak"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 129d792ff..88ad5a571 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,39 +1,36 @@
-# Swedish translations for Subsurface package
-# Swedish messages for Subsurface.
-# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
-# This file is distributed under the same license as the Subsurface package.
-# based on the Norwegian translations by
-# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# stone4x4 <fredrik@ppo2.se>, 2013
+# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: subsurface\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 17:32-0800\n"
-"PO-Revision-Date: 2013-02-27 22:24+0100\n"
-"Last-Translator: Fredrik Steen <fredrik@ppo2.se>\n"
-"Language-Team: Swedish\n"
-"Language: sv_SE\n"
+"POT-Creation-Date: 2013-04-30 11:00-0700\n"
+"PO-Revision-Date: 2013-04-30 17:51+0000\n"
+"Last-Translator: dirkhh <dirk@hohndel.org>\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/subsurface/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
 
-#: gtk-gui.c:973
+#: gtk-gui.c:1190
 msgid ""
 "\n"
 "No Events\n"
-msgstr ""
-"\n"
-"Inga händelser\n"
+msgstr "\nInga händelser\n"
 
-#: statistics.c:177
+#: statistics-gtk.c:94
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Månad"
 
-#: webservice.c:258
+#: webservice.c:289
 msgid " Download"
 msgstr "Ladda ned"
 
@@ -41,17 +38,17 @@ msgstr "Ladda ned"
 msgid " Please select dive computer and device. "
 msgstr " Välj dykdator och enhet"
 
-#: profile.c:414
+#: profile.c:429
 msgctxt "Starts with space!"
 msgid " begin"
 msgstr "start"
 
-#: profile.c:415
+#: profile.c:430
 msgctxt "Starts with space!"
 msgid " end"
 msgstr "slut"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "#"
 msgstr "#"
 
@@ -65,52 +62,53 @@ msgstr "%.*f %s"
 msgid "%.*f %s\n"
 msgstr "%.*f %s\n"
 
-#: statistics.c:259 statistics.c:597 statistics.c:746 statistics.c:748
-#: statistics.c:750
+#: statistics-gtk.c:170 statistics-gtk.c:396 statistics-gtk.c:498
+#: statistics-gtk.c:500 statistics-gtk.c:502
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: planner.c:610
+#: planner.c:581
 #, c-format
 msgid "%.0f%s of %s\n"
 msgstr "%.0f%s av %s\n"
 
-#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday,
+#. monthname, day, year, hour, min
 #: print.c:88
 #, c-format
 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:565
+#: print.c:566
 #, 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:307
+#: divelist.c:569
 #, 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:550
+#: statistics-gtk.c:349
 #, 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:581 statistics.c:557
+#: print.c:582 statistics-gtk.c:356
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:522
+#: statistics.c:204
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %dt %dmin"
 
-#: statistics.c:524
+#: statistics.c:206
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dt %dmin"
@@ -120,185 +118,167 @@ msgstr "%dt %dmin"
 msgid "%s"
 msgstr "%s"
 
-#: profile.c:2177
+#: profile.c:2191
 #, c-format
 msgid ""
 "%s\n"
 "CNS:%u%%"
-msgstr ""
-"%s\n"
-"CNS:%u%%"
+msgstr "%s\nCNS:%u%%"
 
-#: profile.c:2145
+#: profile.c:2159
 #, c-format
 msgid ""
 "%s\n"
 "Calculated ceiling %.0f %s"
-msgstr ""
-"%s\n"
-"Beräknat tak %.0f %s"
+msgstr "%s\nBeräknat tak %.0f %s"
 
-#: profile.c:2161
+#: profile.c:2175
 #, c-format
 msgid ""
 "%s\n"
 "Deco:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko:%umin @ %.0f %s"
+msgstr "%s\nDeko:%umin @ %.0f %s"
 
-#: profile.c:2164
+#: profile.c:2178
 #, c-format
 msgid ""
 "%s\n"
 "Deco:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Deko:okänd tid @ %.0f %s"
+msgstr "%s\nDeko:okänd tid @ %.0f %s"
 
-#: profile.c:2201
+#: profile.c:2215
 #, c-format
 msgid ""
 "%s\n"
 "EAD:%d%s\n"
 "END:%d%s\n"
 "EADD:%d%s"
-msgstr ""
-"%s\n"
-"EAD:%d%s\n"
-"END:%d%s\n"
-"EADD:%d%s"
+msgstr "%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"
 
-#: profile.c:2170
+#: profile.c:2184
 #, c-format
 msgid ""
 "%s\n"
 "In deco"
-msgstr ""
-"%s\n"
-"I deco"
+msgstr "%s\ni deko"
 
-#: profile.c:2194
+#: profile.c:2208
 #, c-format
 msgid ""
 "%s\n"
 "MOD:%d%s"
-msgstr ""
-"%s\n"
-"MOD:%d%s"
+msgstr "%s\nMOD:%d%s"
 
-#: profile.c:2173
+#: profile.c:2187
 #, c-format
 msgid ""
 "%s\n"
 "NDL:%umin"
-msgstr ""
-"%s\n"
-"NDL:%umin"
+msgstr "%s\nNDL:%umin"
 
-#: profile.c:2135
+#: profile.c:2149
 #, c-format
 msgid ""
 "%s\n"
 "P:%d %s"
-msgstr ""
-"%s\n"
-"P:%d %s"
+msgstr "%s\nP:%d %s"
 
-#: profile.c:2153
+#: profile.c:2167
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:%umin @ %.0f %s"
-msgstr ""
-"%s\n"
-"Såkerhetsstopp:%umin @ %.0f %s"
+msgstr "%s\nSåkerhetsstopp:%umin @ %.0f %s"
 
-#: profile.c:2156
+#: profile.c:2170
 #, c-format
 msgid ""
 "%s\n"
 "Safetystop:unkn time @ %.0f %s"
-msgstr ""
-"%s\n"
-"Säkerhetsstopp:okänd tid @ %.0f %s"
+msgstr "%s\nSäkerhetsstopp:okänd tid @ %.0f %s"
 
-#: planner.c:530
+#: planner.c:501
 #, c-format
 msgid ""
 "%s\n"
 "Subsurface dive plan\n"
 "based on GFlow = %.0f and GFhigh = %.0f\n"
 "\n"
-msgstr ""
-"%s\n"
-"Subsurface dykplan\n"
-"baserad på GFlow = %.0f och GFhigh = %.0f\n"
-"\n"
+msgstr "%s\nSubsurface dykplan\nbaserad på GFlow = %.0f och GFhigh = %.0f\n\n"
 
-#: profile.c:2140
+#: profile.c:2154
 #, c-format
 msgid ""
 "%s\n"
 "T:%.1f %s"
-msgstr ""
-"%s\n"
-"T:%.1f %s"
+msgstr "%s\nT:%.1f %s"
 
-#: profile.c:2189
+#: profile.c:2203
 #, c-format
 msgid ""
 "%s\n"
 "pHe:%.2fbar"
-msgstr ""
-"%s\n"
-"pHe:%.2fbar"
+msgstr "%s\npHe:%.2fbar"
 
-#: profile.c:2185
+#: profile.c:2199
 #, c-format
 msgid ""
 "%s\n"
 "pN%s:%.2fbar"
-msgstr ""
-"%s\n"
-"pN%s:%.2fbar"
+msgstr "%s\npN%s:%.2fbar"
 
-#: profile.c:2181
+#: profile.c:2195
 #, c-format
 msgid ""
 "%s\n"
 "pO%s:%.2fbar"
+msgstr "%s\npO%s:%.2fbar"
+
+#: gtk-gui.c:2120
+#, c-format
+msgid "%s event at %d:%02u"
+msgstr "%s händelse vid %d:%02u"
+
+#: divelist-gtk.c:1378
+#, c-format
+msgid "%s: Response from divelogs.de"
 msgstr ""
-"%s\n"
-"pO%s:%.2fbar"
 
-#: dive.c:918
+#: dive.c:921
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) eller (%s)"
 
-#: statistics.c:689
+#: info-gtk.c:491
+msgid "(click to edit date/time)"
+msgstr "(klicka för att ändra datum/tid)"
+
+#: info-gtk.c:493
+msgid "(click to edit date/time/depth)"
+msgstr "(klicka för att ändra datum/tid/djup)"
+
+#: statistics.c:265
 #, c-format
 msgid "(no dives)"
 msgstr "(inga dyk)"
 
-#: gtk-gui.c:2017
+#: gtk-gui.c:2392
 msgid "(nothing)"
 msgstr "(inget)"
 
-#: planner.c:1323
+#: planner-gtk.c:389
 msgid "0.6 cuft/min"
 msgstr "0.6 ft³/min"
 
-#: planner.c:1322
+#: planner-gtk.c:388
 msgid "0.7 cuft/min"
 msgstr "0.7 ft³/min"
 
-#: planner.c:1328
+#: planner-gtk.c:394
 msgid "17 l/min"
 msgstr "17 l/min"
 
-#: print.c:893
+#: print.c:956
 msgid "2 dives per page"
 msgstr "2 dyk per sida"
 
@@ -306,67 +286,78 @@ msgstr "2 dyk per sida"
 msgid "2 pcs full suit"
 msgstr "2 pcs full suit"
 
-#: planner.c:1327
+#: planner-gtk.c:393
 msgid "20 l/min"
 msgstr "20 l/min"
 
-#: gtk-gui.c:846
+#: gtk-gui.c:999
 msgid "3m increments for calculated ceiling"
 msgstr "beräknat tak i 3m steg"
 
-#: print.c:889
+#: print.c:952
 msgid "6 dives per page"
 msgstr "6 dyk per sida"
 
-#: planner.c:1272
+#: planner-gtk.c:336
 msgid ""
 "<small>Add segments below.\n"
 "Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
 "An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
 "An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
 "CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
-msgstr ""
-"<small>Lägg till dyksegment nedan.\n"
-"Var rad beskriver en del av den planerade dykningen.\n"
-"En rad med djup, tid och gas-information beskriver ett segment som slutar på det givna djupet, efter den givna tiden (om relativ tid, t.ex. '+3:30') eller vid den givna tiden (om absolut), och använder den divna gasen.\n"
-"En tom gas betyder 'samma gas som tidigare segment'' (eller luft  om det inte fanns en tidigare gas).\n"
-"En rad som har ett djup och gas men ingen tid är speciell; det informerar pleneringen att den gasen kan användas för planering när planen överskrider det givna djpet.\n"
-"CC SetPoint används for CC (rebreather) dykningar, lämna tomt för OC.</small>\n"
-
-#: planner.c:1198
+msgstr "<small>Lägg till dyksegment nedan. Var rad beskriver en del av den planerade dykningen. En rad med djup, tid och gas-information beskriver ett segment som slutar på det givna djupet, efter den givna tiden (om relativ tid, t.ex. '+3:30') eller vid den givna tiden (om absolut), och använder den givna gasen. En tom gas betyder 'samma gas som tidigare segment'' (eller luft om det inte fanns en tidigare gas). En rad som har ett djup och gas men ingen tid är speciell; det informerar planeraren att den gasen kan användas för planering när planen överskrider det givna djpet. CC SetPoint används for CC (rebreather) dykningar, lämna tomt för OC.</small>\n"
+
+#: planner-gtk.c:262
 msgid "AIR"
 msgstr "LUFT"
 
-#: gtk-gui.c:1067 gtk-gui.c:1399
+#: gtk-gui.c:1284 gtk-gui.c:1641
 msgid "About Subsurface"
 msgstr "Om Subsurface"
 
-#: gtk-gui.c:1390
+#: gtk-gui.c:2135
+msgid "Add"
+msgstr "Lägg till"
+
+#: gtk-gui.c:1631
 msgid "Add Dive..."
 msgstr "Nytt dyk..."
 
-#: divelist.c:2049
+#: gtk-gui.c:2189
+msgid "Add bookmark event here"
+msgstr "Lägg till ett bokmärke här"
+
+#: divelist-gtk.c:1672
 msgid "Add dive"
 msgstr "Nytt dyk"
 
-#: divelist.c:2151
+#: gtk-gui.c:2184
+msgid "Add gas change event here"
+msgstr "Lägg till gasbyte här"
+
+#: equipment.c:633
+#, c-format
+msgid "Add gaschange event at %d:%02u"
+msgstr "Lägg till gasbyte här vid %d:%02u"
+
+#: divelist-gtk.c:1797
 msgid "Add to trip above"
 msgstr "Kombinera med resan ovan"
 
-#: planner.c:1347
+#: planner-gtk.c:413
 msgid "Add waypoint"
 msgstr "Lägg till"
 
-#: statistics.c:856
+#: statistics-gtk.c:608
 msgid "Air Press"
 msgstr "Lufttryck"
 
-#: statistics.c:855
+#: statistics-gtk.c:607
 msgid "Air Temp"
 msgstr "Lufttemp"
 
-#: info.c:814
+#: info-gtk.c:596
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Lufttemp i %s"
@@ -375,77 +366,86 @@ msgstr "Lufttemp i %s"
 msgid "Always prefer downloaded dive"
 msgstr "Föredra alltid nyladdad dykinformation"
 
-#: main.c:71
+#: main.c:77
 msgid "Apr"
 msgstr "apr"
 
-#: main.c:72
+#: main.c:78
 msgid "Aug"
 msgstr "aug"
 
-#: gtk-gui.c:1413
+#: gtk-gui.c:1655
 msgid "Autogroup"
 msgstr "Gruppera automatiskt"
 
-#: statistics.c:183
+#: equipment.c:642
+msgid "Available gases"
+msgstr "Tillgänglig gas"
+
+#: statistics-gtk.c:100
 msgctxt "Depth"
 msgid "Average"
 msgstr "Genomsnitt"
 
-#: statistics.c:180
+#: statistics-gtk.c:97
 msgctxt "Duration"
 msgid "Average"
 msgstr "Genomsnitt"
 
-#: statistics.c:186
+#: statistics-gtk.c:103
 msgctxt "SAC"
 msgid "Average"
 msgstr "Genomsnitt"
 
-#: statistics.c:189
+#: statistics-gtk.c:106
 msgctxt "Temp"
 msgid "Average"
 msgstr "Genomsnitt"
 
-#: statistics.c:810 statistics.c:847
+#: statistics-gtk.c:562 statistics-gtk.c:599
 msgid "Avg Depth"
 msgstr "Medeldjup"
 
-#: statistics.c:818
+#: info-gtk.c:929
+#, c-format
+msgid "Avg Depth (%s):"
+msgstr "Medeldjup (%s):"
+
+#: statistics-gtk.c:570
 msgid "Avg SAC"
 msgstr "Medel-SAC"
 
-#: statistics.c:793
+#: statistics-gtk.c:545
 msgid "Avg Temp"
 msgstr "Medel-temp"
 
-#: statistics.c:800
+#: statistics-gtk.c:552
 msgid "Avg Time"
 msgstr "Medel-tid"
 
-#: profile.c:411
+#: profile.c:426
 #, c-format
 msgid "Bailing out to OC"
 msgstr "Bailout till öppet system"
 
-#: gtk-gui.c:647
+#: gtk-gui.c:790
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:800 info.c:1253 print.c:503
+#: info-gtk.c:582 info-gtk.c:1002 print.c:503
 msgid "Buddy"
 msgstr "Parkamrat"
 
-#: planner.c:1227
+#: planner-gtk.c:291
 msgid "CC SetPoint"
 msgstr "CC SetPoint"
 
-#: planner.c:163
+#: planner.c:123
 #, c-format
 msgid "Can't find gas %d/%d"
 msgstr "Kan inte hitta gasen %d/%d"
 
-#: parse-xml.c:1634
+#: parse-xml.c:1953
 #, c-format
 msgid "Can't open stylesheet (%s)/%s"
 msgstr "Kunde inte öppna stilmall (%s)%s"
@@ -458,121 +458,143 @@ msgstr "Avbrutet ..."
 msgid "Cancelled..."
 msgstr "Avbrutet ..."
 
-#: webservice.c:28
+#: equipment.c:621
+msgid "Cannot add gas change"
+msgstr "Kan inte lägga till gasbyte"
+
+#: webservice.c:29
 msgid "Cannot parse response!"
 msgstr "Kan inte tolka respons"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:800
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:569
+#: gtk-gui.c:686
 msgid "Choose Default XML File"
 msgstr "Välj standard XML-fil"
 
-#: gtk-gui.c:1919
+#: gtk-gui.c:2294
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Välj vilka XML-filer du vill importera"
 
-#: gtk-gui.c:1385
+#: gtk-gui.c:1622
 msgid "Close"
 msgstr "Stäng"
 
-#: divelist.c:2169
+#: divelist-gtk.c:1815
 msgid "Collapse all"
 msgstr "Sammanslå alla"
 
-#: webservice.c:120
+#: divelist-gtk.c:1481
+msgid "Communication error with divelogs.de"
+msgstr ""
+
+#: webservice.c:121
 msgid "Connecting..."
 msgstr "Kontaktar..."
 
-#: webservice.c:24
+#: webservice.c:25
 msgid "Connection Error: "
 msgstr "Kontaktfel:"
 
-#: divelist.c:2141
+#: divelist-gtk.c:1787
 msgid "Create new trip above"
 msgstr "Ny resa innan"
 
-#: gtk-gui.c:653
+#: gtk-gui.c:796
 msgid "CuFt"
 msgstr "ft^3"
 
-#: divelist.c:1422 gtk-gui.c:677
+#: divelist-gtk.c:824 gtk-gui.c:820
 msgid "Cyl"
 msgstr "Cyl"
 
-#: equipment.c:919 equipment.c:1030 print.c:201
+#: equipment.c:982 equipment.c:1093 print.c:201
 msgid "Cylinder"
 msgstr "Flaska"
 
-#: planner.c:224
+#: planner.c:184
 msgid "Cylinder for planning"
 msgstr "Flaska för planering"
 
-#: equipment.c:1540
+#: equipment.c:1603
 msgid "Cylinders"
 msgstr "Flaskor"
 
-#: profile.c:2131
+#: profile.c:2145
 #, c-format
 msgid "D:%.1f %s"
 msgstr "D:%.1f %s"
 
-#: planner.c:1284
-msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+#: planner-gtk.c:349
+msgid ""
+"DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM"
+" AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A "
+"LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY "
+"BASED ON THE RESULTS GIVEN HERE."
 msgstr "VARNING: DETTA ÄR EN NY IMPLEMENTATION AV BÜHLMANN'S DEKO ALGORITM OCH EN DYKPLANERARE BASERAD PÅ DEN, OCH KODEN HAR SETT ENDAST LITE TESTNING. VI FÖRESLÅR ATT MAN INTE GÖR DYK BASERADE ENBART PÅ RESULTATEN AV DENNA PLAN!"
 
-#: divelist.c:1415 print.c:502 statistics.c:838
+#: parse-xml.c:1835
+#, c-format
+msgid "Database connection failed '%s'.\n"
+msgstr "Databasanslutning misslyckades '%s'.\n"
+
+#: parse-xml.c:1842
+#, c-format
+msgid "Database query failed '%s'.\n"
+msgstr "Databasfråga misslyckades '%s'.\n"
+
+#: parse-xml.c:1800
+#, c-format
+msgid "Database query get_events failed.\n"
+msgstr "Databasfråga get_events misslyckades.\n"
+
+#: divelist-gtk.c:817 print.c:502 statistics-gtk.c:590
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:1101
+#: info-gtk.c:821
 msgid "Date and Time"
 msgstr "Datum och tid"
 
-#: info.c:1111
+#: info-gtk.c:831
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:72
+#: main.c:78
 msgid "Dec"
 msgstr "dec"
 
-#: gtk-gui.c:714
+#: gtk-gui.c:862
 msgid "Default XML Data File"
 msgstr "Standard XML-fil"
 
-#: gtk-gui.c:1332
+#: gtk-gui.c:1569
 msgid "Delete a dive computer information entry"
 msgstr "Radera dykdatorinformation"
 
-#: divelist.c:1897 divelist.c:1948 divelist.c:2036
+#: divelist-gtk.c:1297 divelist-gtk.c:1348 divelist-gtk.c:1653
 msgid "Delete dive"
 msgstr "Radera dyk"
 
-#: divelist.c:1899 divelist.c:2035
+#: divelist-gtk.c:1299 divelist-gtk.c:1652
 msgid "Delete dives"
 msgstr "Radera dyk"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Depth"
 msgstr "Djup"
 
-#: info.c:1178
-#, c-format
-msgid "Depth (%s):"
-msgstr "Djup (%s):"
-
 #: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Maxdjup har överskridits"
 
-#: gtk-gui.c:641
+#: gtk-gui.c:784
 msgid "Depth:"
 msgstr "Djup:"
 
-#: gtk-gui.c:1291
+#: gtk-gui.c:1528
 msgid "Device Id"
 msgstr "Enhetsnamn"
 
@@ -580,13 +602,18 @@ msgstr "Enhetsnamn"
 msgid "Device or mount point"
 msgstr "Enhet eller monteringspunkt"
 
+#: gtk-gui.c:857
+msgid "Display invalid dives"
+msgstr "Visa ogiltiga dyk"
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:105
+#. <trailing text>
+#: info.c:88
 #, c-format
-msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-msgstr "Dyk #%1$d - %2$s %4$02d.%3$02d.%5$04d kl %6$d:%7$02d"
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
+msgstr "Dyk #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d %8$s"
 
-#: info.c:157 print.c:83
+#: info.c:130 print.c:83
 #, c-format
 msgid "Dive #%d - "
 msgstr "Dyk #%d - "
@@ -596,23 +623,27 @@ msgstr "Dyk #%d - "
 msgid "Dive %d: %s %d %04d"
 msgstr "Dyk #%d: %s %d %04d"
 
-#: gtk-gui.c:1999
+#: gtk-gui.c:2374
 msgid "Dive Computer Nickname"
 msgstr "Dykdatornamn"
 
-#: gtk-gui.c:1631 info.c:998 statistics.c:829
+#: gtk-gui.c:1880 info-gtk.c:709 statistics-gtk.c:581
 msgid "Dive Info"
 msgstr "Information"
 
-#: gtk-gui.c:1623
+#: gtk-gui.c:1872
 msgid "Dive Notes"
 msgstr "Dykanteckningar"
 
-#: planner.c:1294
+#: planner-gtk.c:360
 msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
 msgstr "Dykplan - DETTA ÄR BARA EN SIMULATION; ANVÄND INTE FÖR DYKNING"
 
-#: statistics.c:839
+#: info-gtk.c:603 statistics-gtk.c:623
+msgid "Dive Tags"
+msgstr "Dyktagg"
+
+#: statistics-gtk.c:591
 msgid "Dive Time"
 msgstr "Dyktid"
 
@@ -632,15 +663,15 @@ msgstr "Dykdatorleverantör och produkt"
 msgid "Dive data import error"
 msgstr "Lyckades inte importera dykdata"
 
-#: gps.c:220
+#: gps.c:214
 msgid "Dive locations"
 msgstr "Dykplatser"
 
-#: info.c:799
+#: info-gtk.c:581
 msgid "Dive master"
 msgstr "Divemaster"
 
-#: planner.c:1316
+#: planner-gtk.c:382
 msgid "Dive starts when?"
 msgstr "När börjar dyket?"
 
@@ -648,19 +679,19 @@ msgstr "När börjar dyket?"
 msgid "Dive#"
 msgstr "Dyknr"
 
-#: gtk-gui.c:702
+#: gtk-gui.c:845
 msgid "Divelist Font"
 msgstr "Font för dyklistan"
 
-#: info.c:1252
+#: info-gtk.c:1001
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:790
+#: statistics-gtk.c:542
 msgid "Dives"
 msgstr "Dyk"
 
-#: gtk-gui.c:1395
+#: gtk-gui.c:1636
 msgid "Dives Locations"
 msgstr "Dykplatser"
 
@@ -668,111 +699,123 @@ msgstr "Dykplatser"
 msgid "Download From Dive Computer"
 msgstr "Ladda ner från dykdator"
 
-#: gtk-gui.c:1388
+#: gtk-gui.c:1629
 msgid "Download From Dive Computer..."
 msgstr "Ladda ner från dykdator..."
 
-#: webservice.c:229
+#: webservice.c:260
 msgid "Download From Web Service"
 msgstr "Ladda ner från webbtjänst"
 
-#: gtk-gui.c:1389
+#: gtk-gui.c:1630
 msgid "Download From Web Service..."
 msgstr "Ladda ned från webbtjänst..."
 
-#: webservice.c:30
+#: webservice.c:31
 msgid "Download Success!"
 msgstr "Nedladdning lyckades!"
 
-#: print.c:502 statistics.c:175
+#: print.c:502 statistics-gtk.c:92
 msgid "Duration"
 msgstr "Varaktighet"
 
-#: info.c:1173
+#: info-gtk.c:908
 msgid "Duration (min)"
 msgstr "Varaktighet (min)"
 
-#: info.c:652
+#: info.c:312
 msgid "E"
 msgstr "E"
 
-#: planner.c:129
+#: planner.c:88
 #, c-format
 msgid "EAN%d"
 msgstr "EAN%d"
 
-#: planner.c:1199
+#: planner-gtk.c:263
 msgid "EAN32"
 msgstr "EAN32"
 
-#: planner.c:1200
+#: planner-gtk.c:264
 msgid "EAN36"
 msgstr "EAN36"
 
-#: info.c:222
+#: info-gtk.c:99
 msgid "Edit"
 msgstr "Redigera"
 
-#: gtk-gui.c:1405
+#: gtk-gui.c:1647
 msgid "Edit Device Names"
 msgstr "Ändra Enhetsnamn"
 
-#: gtk-gui.c:1264
+#: gtk-gui.c:1501
 msgid "Edit Dive Computer Nicknames"
 msgstr "Ändra dykdatorers namn"
 
-#: info.c:957
+#: info-gtk.c:663
 msgid "Edit Trip Info"
 msgstr "Ändra reseinformation"
 
-#: divelist.c:2057
+#: divelist-gtk.c:1680
 msgid "Edit Trip Summary"
 msgstr "Ändra resesammandrag"
 
-#: gtk-gui.c:1324
-msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+#: gtk-gui.c:1561
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
 msgstr "Ändra dykdatorns namn genom att dubbel-klicka på namnfältet"
 
-#: divelist.c:2033
+#: divelist-gtk.c:1650
 msgid "Edit dive"
 msgstr "Redigera dyk"
 
-#: divelist.c:2090 divelist.c:2113
+#: divelist-gtk.c:1713 divelist-gtk.c:1759
 msgid "Edit dive date/time"
 msgstr "Redigera dyk datum/tid"
 
-#: divelist.c:2032
+#: divelist-gtk.c:1649
 msgid "Edit dives"
 msgstr "Redigera dyk"
 
-#: info.c:765
+#: info-gtk.c:539
 msgid "Edit multiple dives"
 msgstr "Redigera flera dyk"
 
-#: info.c:616
+#: info-gtk.c:369
 msgid "Edit trip summary"
 msgstr "Redigera resesammandrag"
 
-#: gtk-gui.c:966
+#: gtk-gui.c:1183
 msgid "Enable / Disable Events"
 msgstr "Aktivera / Inaktivera händelser"
 
-#: equipment.c:950 equipment.c:1457
+#: gtk-gui.c:1147
+msgid "Enable / Disable Tags"
+msgstr "Aktivera / Avaktivera taggar"
+
+#: equipment.c:1013 equipment.c:1520
 msgid "End"
 msgstr "Slut"
 
-#: planner.c:1224
+#: planner-gtk.c:288
 msgid "Ending Depth"
 msgstr "Slutdjup"
 
-#: webservice.c:244
-msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+#: webservice.c:275
+msgid ""
+"Enter a user identifier and press 'Download'. Once the download is complete "
+"you can press 'Apply' if you wish to apply the changes."
 msgstr "Ange ditt användarid och tryck 'Ladda ner'. När laddningen är färdig kan du trycka på 'Använd' för att använda data"
 
-#: gtk-gui.c:1627 info.c:833
+#: gtk-gui.c:1876 info-gtk.c:648
 msgid "Equipment"
 msgstr "Utrustning"
 
+#: divelist-gtk.c:1378
+msgid "Error"
+msgstr ""
+
 #: libdivecomputer.c:471
 msgid "Error obtaining water salinity"
 msgstr "Kunde inte ladda vattnets salthalt"
@@ -822,52 +865,64 @@ msgstr "Event: systime=%<PRId64>, devtime=%u\n"
 msgid "Event: waiting for user action"
 msgstr "Händelse: väntar på användaren"
 
-#: divelist.c:2165
+#: divelist-gtk.c:1811
 msgid "Expand all"
 msgstr "Expandera alla"
 
-#: gtk-gui.c:658
+#: divelist-gtk.c:1529
+msgid "Export As UDDF File"
+msgstr "Exportera som UDDF fil"
+
+#: gtk-gui.c:1625
+msgid "Export UDDF..."
+msgstr "Exportera UDDF..."
+
+#: divelist-gtk.c:1656
+msgid "Export dive(s) to UDDF"
+msgstr "Exportera dyk till UDDF"
+
+#: gtk-gui.c:801
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:116
+#: gtk-gui.c:124
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Kunde inte öppna %i filer."
 
-#: parse-xml.c:1522
+#: parse-xml.c:1599
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Kunde inte läsa '%s'"
 
-#: parse-xml.c:1521
+#: parse-xml.c:1598
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Kunde inte läsa '%s'.\n"
 
-#: file.c:271
+#: file.c:282
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Kunde inte öppna '%s'"
 
-#: file.c:267
+#: file.c:278
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Kunde inte öppna '%s'.\n"
 
-#: main.c:71
+#: main.c:77
 msgid "Feb"
 msgstr "feb"
 
-#: gtk-gui.c:643
+#: gtk-gui.c:786
 msgid "Feet"
 msgstr "fot"
 
-#: gtk-gui.c:1375
+#: gtk-gui.c:1612
 msgid "File"
 msgstr "Fil"
 
-#: gtk-gui.c:1378
+#: gtk-gui.c:1615
 msgid "Filter"
 msgstr "Filter"
 
@@ -875,27 +930,27 @@ msgstr "Filter"
 msgid "Force download of all dives"
 msgstr "Tvinga nedladdning av alla dyk"
 
-#: main.c:62
+#: main.c:68
 msgid "Fri"
 msgstr "fre"
 
-#: gtk-gui.c:864
+#: gtk-gui.c:1017
 msgid "GFhigh"
 msgstr "GFhigh"
 
-#: planner.c:1339
+#: planner-gtk.c:405
 msgid "GFhigh for plan"
 msgstr "GFhigh för dykplanering"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:1007
 msgid "GFlow"
 msgstr "GFlow"
 
-#: planner.c:1338
+#: planner-gtk.c:404
 msgid "GFlow for plan"
 msgstr "GFlow för dykplanering"
 
-#: info.c:777
+#: info-gtk.c:559
 msgid "GPS (WGS84 or GPS format)"
 msgstr "GPS (WGS84 eller GPS format)"
 
@@ -904,42 +959,42 @@ msgstr "GPS (WGS84 eller GPS format)"
 msgid "Gas Used"
 msgstr "Gasanvändning"
 
-#: statistics.c:865
+#: statistics-gtk.c:617
 msgctxt "Amount"
 msgid "Gas Used"
 msgstr "Gasanvändning"
 
-#: planner.c:1226
+#: planner-gtk.c:290
 msgctxt "Type of"
 msgid "Gas Used"
 msgstr "Gasanvändning"
 
-#: planner.c:599
+#: planner.c:570
 #, c-format
 msgid "Gas consumption:\n"
 msgstr "Gasanvändning:\n"
 
-#: equipment.c:960 print.c:201
+#: equipment.c:1023 print.c:201
 msgid "Gasmix"
 msgstr "Gasblandning"
 
-#: gtk-gui.c:634
+#: gtk-gui.c:777
 msgid "General Settings"
 msgstr "Allmänna Iinställningar"
 
-#: gtk-gui.c:1380
+#: gtk-gui.c:1617
 msgid "Help"
 msgstr "Hjälp"
 
-#: webservice.c:265
+#: webservice.c:296
 msgid "Idle"
 msgstr "Idle"
 
-#: gtk-gui.c:1387
-msgid "Import XML File(s)..."
-msgstr "Importera XML-fil(er)..."
+#: gtk-gui.c:1624
+msgid "Import File(s)..."
+msgstr "Importera fil(er)..."
 
-#: gtk-gui.c:1403
+#: divelist-gtk.c:1378 gtk-gui.c:1645
 msgid "Info"
 msgstr "Info"
 
@@ -947,71 +1002,75 @@ msgstr "Info"
 msgid "Init Communication"
 msgstr "Initierar anslutning"
 
-#: gtk-gui.c:1408
+#: gtk-gui.c:1650
 msgid "Input Plan"
 msgstr "Skriv plan"
 
-#: planner.c:1087
+#: planner-gtk.c:145
 #, c-format
 msgid "Invalid depth - could not parse \"%s\""
 msgstr "Ogiltigt djup - kunde inte tolka  \"%s\""
 
-#: planner.c:1089
+#: planner-gtk.c:147
 msgid "Invalid depth - values deeper than 400m not supported"
 msgstr "Ogiltigt djup - värden djupare än 400m stöds inte"
 
-#: planner.c:1065
+#: planner-gtk.c:118
 #, c-format
 msgid "Invalid gas for row %d"
 msgstr "Ogiltig gas för rad %d"
 
-#: planner.c:1153
+#: planner-gtk.c:207
 msgid "Invalid starttime"
 msgstr "Ogiltig starttid"
 
-#: webservice.c:26
+#: webservice.c:27
 msgid "Invalid user identifier!"
 msgstr "Ogiltigt användarid!"
 
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:71
+#: main.c:77
 msgid "Jan"
 msgstr "jan"
 
-#: main.c:72
+#: main.c:78
 msgid "Jul"
 msgstr "jul"
 
-#: main.c:71
+#: main.c:77
 msgid "Jun"
 msgstr "jun"
 
-#: gtk-gui.c:1073
+#: print.c:985
+msgid "Layout Options"
+msgstr "Layout Optioner"
+
+#: gtk-gui.c:1290
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 
-#: gtk-gui.c:1401
+#: gtk-gui.c:1643
 msgid "List"
 msgstr "Lista"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:795
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1427 info.c:621 info.c:772 info.c:1247 print.c:503
+#: divelist-gtk.c:829 info-gtk.c:374 info-gtk.c:554 info-gtk.c:996 print.c:503
 msgid "Location"
 msgstr "Plats"
 
-#: gtk-gui.c:1376
+#: gtk-gui.c:1613
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:182
+#: statistics-gtk.c:99
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Längsta"
 
-#: statistics.c:801
+#: statistics-gtk.c:553
 msgid "Longest Dive"
 msgstr "Längsta dyk"
 
@@ -1023,14 +1082,26 @@ msgstr "Batterivarning"
 msgid "Low Battery Warning"
 msgstr "Batterivarning"
 
-#: main.c:71
+#: gtk-gui.c:872
+msgid "Map provider"
+msgstr "Kartleverantör"
+
+#: main.c:77
 msgid "Mar"
 msgstr "mar"
 
-#: gps.c:59
+#: divelist-gtk.c:1728 divelist-gtk.c:1730
+msgid "Mark invalid"
+msgstr "Märk som ogiltig"
+
+#: gps.c:53
 msgid "Mark location here"
 msgstr "Markera platsen här"
 
+#: divelist-gtk.c:1726
+msgid "Mark valid"
+msgstr "Märk som giltig"
+
 #: uemis.c:230
 msgid "Marker"
 msgstr "markering"
@@ -1043,15 +1114,20 @@ msgstr "master"
 msgid "Max Deco Time Warning"
 msgstr "Varning: max dekotid"
 
-#: statistics.c:808 statistics.c:846
+#: statistics-gtk.c:560 statistics-gtk.c:598
 msgid "Max Depth"
 msgstr "Maxdjup"
 
-#: statistics.c:816
+#: info-gtk.c:918
+#, c-format
+msgid "Max Depth (%s):"
+msgstr "Maxdjup (%s):"
+
+#: statistics-gtk.c:568
 msgid "Max SAC"
 msgstr "Max SAC"
 
-#: statistics.c:791
+#: statistics-gtk.c:543
 msgid "Max Temp"
 msgstr "Max temp"
 
@@ -1061,115 +1137,112 @@ msgid ""
 "Max depth: %.*f %s\n"
 "Duration: %d min\n"
 "%s"
-msgstr ""
-"Maxdjup: %.*f %s\n"
-"Tid: %d min\n"
-"%s"
+msgstr "Maxdjup: %.*f %s\nTid: %d min\n%s"
 
 #: print.c:377
 #, c-format
 msgid "Max. CNS"
 msgstr "Max. CNS"
 
-#: equipment.c:1455
+#: equipment.c:1518
 msgid "MaxPress"
 msgstr "Max tryck"
 
-#: statistics.c:185
+#: statistics-gtk.c:102
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:188
+#: statistics-gtk.c:105
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:191
+#: statistics-gtk.c:108
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: main.c:71
+#: main.c:77
 msgid "May"
 msgstr "maj"
 
-#: divelist.c:2024
+#: divelist-gtk.c:1641
 msgid "Merge dives"
 msgstr "Sammanslå dyk"
 
-#: divelist.c:2065
+#: divelist-gtk.c:1688
 msgid "Merge trip with trip above"
 msgstr "Sammanfoga resa med tidigare resa"
 
-#: divelist.c:2075
+#: divelist-gtk.c:1698
 msgid "Merge trip with trip below"
 msgstr "Sammanfoga resa med senare resa"
 
-#: gtk-gui.c:642
+#: gtk-gui.c:785
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:809
+#: statistics-gtk.c:561
 msgid "Min Depth"
 msgstr "Min. djup"
 
-#: statistics.c:817
+#: statistics-gtk.c:569
 msgid "Min SAC"
 msgstr "Min. SAC"
 
-#: statistics.c:792
+#: statistics-gtk.c:544
 msgid "Min Temp"
 msgstr "Min. temp"
 
-#: statistics.c:184
+#: statistics-gtk.c:101
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:187
+#: statistics-gtk.c:104
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:190
+#: statistics-gtk.c:107
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:708
+#: gtk-gui.c:851
 msgid "Misc. Options"
 msgstr "Diverse inställningar"
 
-#: gtk-gui.c:1286
+#: gtk-gui.c:1523
 msgid "Model"
 msgstr "Modell"
 
-#: main.c:62
+#: main.c:68
 msgid "Mon"
 msgstr "mån"
 
-#: gtk-gui.c:1069
+#: gtk-gui.c:1286
 msgid "Multi-platform divelog software in C"
 msgstr "Dyklogg i C för flera plattformar"
 
-#: info.c:651
+#: info.c:311
 msgid "N"
 msgstr "N"
 
-#: gtk-gui.c:1381
+#: gtk-gui.c:1618
 msgid "New"
 msgstr "Ny"
 
-#: gtk-gui.c:1021
+#: gtk-gui.c:1238
 msgid "New starting number"
 msgstr "Nytt startnummer"
 
-#: gtk-gui.c:1407
+#: gtk-gui.c:1649
 msgid "Next DC"
 msgstr "Nästa dykdator"
 
-#: gtk-gui.c:1296 gtk-gui.c:2021
+#: gtk-gui.c:1533 gtk-gui.c:2396
 msgid "Nickname"
 msgstr "Enhetsnamn"
 
@@ -1177,11 +1250,24 @@ msgstr "Enhetsnamn"
 msgid "No Tank Data"
 msgstr "Ingen flaskinformation"
 
-#: info.c:626 info.c:825 info.c:1261
+#: equipment.c:627
+msgid "No cylinders listed for this dive."
+msgstr "Inga flaskor listade för detta dyk."
+
+#: info-gtk.c:379 info-gtk.c:639 info-gtk.c:1010
 msgid "Notes"
 msgstr "Anteckningar"
 
-#: main.c:72
+#: print.c:1025
+#, c-format
+msgid "Notes height (%d%% - %d%%)"
+msgstr "Anteckningar höjd (%d%% - %d%%)"
+
+#: print.c:1003
+msgid "Notes on top"
+msgstr "Anteckningar ovanpå"
+
+#: main.c:78
 msgid "Nov"
 msgstr "nov"
 
@@ -1189,12 +1275,12 @@ msgstr "nov"
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1425 gtk-gui.c:735 print.c:361 statistics.c:863
+#: divelist-gtk.c:827 gtk-gui.c:888 print.c:361 statistics-gtk.c:615
 #, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:72
+#: main.c:78
 msgid "Oct"
 msgstr "okt"
 
@@ -1202,18 +1288,31 @@ msgstr "okt"
 msgid "Odd pthread error return"
 msgstr "Konstig felreturn from pthread"
 
-#: gtk-gui.c:1343
+#: gtk-gui.c:1580
 msgid "Ok to delete the selected entry?"
 msgstr "Ok att radera?"
 
-#: gtk-gui.c:280
+#: gtk-gui.c:1138
+msgid "Only display dives with these tags:"
+msgstr "Visa endast dyk med dessa taggar:"
+
+#: gtk-gui.c:297
 msgid "Open File"
 msgstr "Öppna fil"
 
-#: gtk-gui.c:1382
+#: gtk-gui.c:1619
 msgid "Open..."
 msgstr "Öppna..."
 
+#: print.c:995
+msgid "Ordering"
+msgstr "Sortering"
+
+#: print.c:1024
+#, c-format
+msgid "Other data height (%d%% - %d%%)"
+msgstr "Höjd på övriga uppgifter (%d%% - %d%%)"
+
 #: print.c:173
 #, c-format
 msgid "Oxygen"
@@ -1235,63 +1334,86 @@ msgstr "Varning: uppstigning / PO2"
 msgid "PO2 Green Warning"
 msgstr "Varning: grön PO2"
 
-#: gtk-gui.c:648
+#: gtk-gui.c:791
 msgid "PSI"
 msgstr "psi"
 
-#: info.c:788
+#: webservice.c:341
+msgid "Password"
+msgstr "Lösenord"
+
+#: info-gtk.c:570
 msgid "Pick on map"
 msgstr "Välj från karta"
 
-#: gtk-gui.c:1379
+#: gtk-gui.c:1616
 msgid "Planner"
 msgstr "Planerare"
 
-#: gtk-gui.c:619
+#: webservice.c:327
+msgid ""
+"Please enter your userid and password for divelogs.de. The selected dives "
+"will be added to your account"
+msgstr "Vänligen ange ditt användarnamn och lösenord för divelogs.de. De markerade dyken kommer att läggas till ditt konto."
+
+#: gtk-gui.c:762
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: gtk-gui.c:1391
+#: gtk-gui.c:1632
 msgid "Preferences..."
 msgstr "Inställningar..."
 
-#: equipment.c:939 equipment.c:945
+#: equipment.c:1002 equipment.c:1008
 msgid "Pressure"
 msgstr "Tryck"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:789
 msgid "Pressure:"
 msgstr "Tryck:"
 
-#: gtk-gui.c:1406
+#: gtk-gui.c:1648
 msgid "Prev DC"
 msgstr "Föregående dykdator"
 
-#: print.c:916
+#: print.c:989
+msgid "Print in color"
+msgstr "Skriv ut i färg"
+
+#: print.c:978
 msgid "Print only selected dives"
 msgstr "Skriv ut valda dyk"
 
-#: print.c:911
+#: print.c:974
 msgid "Print selection"
 msgstr "Skriv ut valda dyk"
 
-#: print.c:879 print.c:883
+#: print.c:939 print.c:946
 msgid "Print type"
 msgstr "Utskriftstyp"
 
-#: gtk-gui.c:1386
+#: gtk-gui.c:1623
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: gtk-gui.c:1402
+#: gtk-gui.c:1644
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:745
+#: gtk-gui.c:898
 msgid "Profile Settings"
 msgstr "Profilinställningar"
 
-#: gtk-gui.c:1398
+#: print.c:1023
+#, c-format
+msgid "Profile height (%d%% - %d%%)"
+msgstr "Profilhöjd (%d%% - %d%%)"
+
+#: print.c:1000
+msgid "Profile on top"
+msgstr "Profil ovanpå"
+
+#: gtk-gui.c:1640
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -1303,7 +1425,7 @@ msgstr "Varning: gastid"
 msgid "RGT Warning"
 msgstr "Varning: gastid"
 
-#: info.c:805 info.c:1258
+#: info-gtk.c:587 info-gtk.c:1007
 msgid "Rating"
 msgstr "Rankning"
 
@@ -1312,23 +1434,31 @@ msgstr "Rankning"
 msgid "Reading %s %s"
 msgstr "Läser %s %s"
 
-#: divelist.c:1771 divelist.c:2080
+#: gtk-gui.c:2161
+msgid "Remove"
+msgstr "Ta bort"
+
+#: divelist-gtk.c:1213 divelist-gtk.c:1703
 msgid "Remove Trip"
 msgstr "Radera resa"
 
-#: divelist.c:2159
+#: divelist-gtk.c:1805
 msgid "Remove dive from trip"
 msgstr "Ta bort dyk från resa"
 
-#: divelist.c:2157
+#: gtk-gui.c:2195
+msgid "Remove event here"
+msgstr "Ta bort händelse"
+
+#: divelist-gtk.c:1803
 msgid "Remove selected dives from trip"
 msgstr "Ta bort valda dyk från resa"
 
-#: gtk-gui.c:1012
+#: gtk-gui.c:1229
 msgid "Renumber"
 msgstr "Uppdatera numrering"
 
-#: gtk-gui.c:1392
+#: gtk-gui.c:1633
 msgid "Renumber..."
 msgstr "Uppdatera numrering..."
 
@@ -1336,20 +1466,21 @@ msgstr "Uppdatera numrering..."
 msgid "Retry"
 msgstr "Försök igen"
 
-#: info.c:651
+#: info.c:311
 msgid "S"
 msgstr "S"
 
-#: divelist.c:1424 gtk-gui.c:687 print.c:395 statistics.c:175 statistics.c:862
+#: divelist-gtk.c:826 gtk-gui.c:830 print.c:395 statistics-gtk.c:92
+#: statistics-gtk.c:614
 #, c-format
 msgid "SAC"
 msgstr "SAC"
 
-#: planner.c:1333
+#: planner-gtk.c:399
 msgid "SAC during decostop"
 msgstr "SAC under dekostopp"
 
-#: planner.c:1332
+#: planner-gtk.c:398
 msgid "SAC during dive"
 msgstr "SAC under dyk"
 
@@ -1357,43 +1488,47 @@ msgstr "SAC under dyk"
 msgid "Safety Stop Violation"
 msgstr "Säkerhetsstopp ej uppfyllt"
 
-#: main.c:62
+#: main.c:68
 msgid "Sat"
 msgstr "lör"
 
-#: gtk-gui.c:1384
+#: gtk-gui.c:1621
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: gtk-gui.c:210
+#: gtk-gui.c:227
 msgid "Save Changes?"
 msgstr "Spara ändringar?"
 
-#: divelist.c:1626 gtk-gui.c:147
+#: divelist-gtk.c:1028 gtk-gui.c:164
 msgid "Save File As"
 msgstr "Spara fil som"
 
-#: divelist.c:2097
+#: divelist-gtk.c:1720
 msgid "Save as"
 msgstr "Spara som"
 
-#: gtk-gui.c:1383
+#: gtk-gui.c:1620
 msgid "Save..."
 msgstr "Spara..."
 
-#: planner.c:1225
+#: planner-gtk.c:289
 msgid "Segment Time"
 msgstr "Segment-tid"
 
-#: gtk-gui.c:957
+#: gtk-gui.c:1174
 msgid "Select Events"
 msgstr "Välj händelser"
 
-#: gtk-gui.c:1397
+#: gtk-gui.c:1638
 msgid "Select Events..."
 msgstr "Välj händelser..."
 
-#: main.c:72
+#: gtk-gui.c:1639
+msgid "Select Tags..."
+msgstr "Välj taggar..."
+
+#: main.c:78
 msgid "Sep"
 msgstr "sep"
 
@@ -1401,65 +1536,68 @@ msgstr "sep"
 msgid ""
 "Short write to req.txt file\n"
 "Is the Uemis Zurich plugged in correctly?"
-msgstr ""
-"Kunde inte skriva filen req.txt\n"
-"Är Uemis Zurich ordentligt ansluten?"
+msgstr "Kunde inte skriva filen req.txt\nÄr Uemis Zurich ordentligt ansluten?"
 
-#: statistics.c:181
+#: statistics-gtk.c:98
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Kortaste"
 
-#: statistics.c:802
+#: statistics-gtk.c:554
 msgid "Shortest Dive"
 msgstr "Kortaste dyk"
 
-#: gtk-gui.c:666 gtk-gui.c:729
+#: gtk-gui.c:809 gtk-gui.c:882
 msgid "Show Columns"
 msgstr "Visa kolumner"
 
-#: gtk-gui.c:825
+#: gtk-gui.c:978
 msgid "Show EAD, END, EADD"
 msgstr "Visa EAD, END, EADD"
 
-#: gtk-gui.c:808
+#: gtk-gui.c:961
 msgid "Show MOD"
 msgstr "Visa MOD"
 
-#: gtk-gui.c:841
+#: gtk-gui.c:994
 msgid "Show calculated ceiling"
 msgstr "Visa beräknad tak-information"
 
-#: gtk-gui.c:833
+#: gtk-gui.c:986
 msgid "Show dc reported ceiling in red"
 msgstr "Visa takinformationen i rött"
 
-#: divelist.c:2130
+#: divelist-gtk.c:1776
 msgid "Show in map"
 msgstr "Visa på kartan"
 
-#: gtk-gui.c:791
+#: gtk-gui.c:944
 msgid "Show pHe graph"
 msgstr "Visa pHe graf"
 
-#: gtk-gui.c:772
+#: gtk-gui.c:925
 #, c-format
 msgid "Show pN%s graph"
 msgstr "Visa pN%s graf"
 
-#: gtk-gui.c:753
+#: gtk-gui.c:906
 #, c-format
 msgid "Show pO%s graph"
 msgstr "Visa pO%s graph"
 
-#: planner.c:248
+#: planner.c:209
 msgid "Simulated Dive"
 msgstr "Simulerat dyk"
 
-#: equipment.c:936 equipment.c:1454
+#: equipment.c:999 equipment.c:1517
 msgid "Size"
 msgstr "Storlek"
 
+#: print.c:1012
+#, c-format
+msgid "Sizing heights (%% of layout)"
+msgstr ""
+
 #: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: uppstigningshastighet"
@@ -1468,7 +1606,7 @@ msgstr "Alarm: uppstigningshastighet"
 msgid "Speed Warning"
 msgstr "Varning: uppstigningshastighet"
 
-#: equipment.c:947 equipment.c:1456
+#: equipment.c:1010 equipment.c:1519
 msgid "Start"
 msgstr "Start"
 
@@ -1476,59 +1614,63 @@ msgstr "Start"
 msgid "Start download"
 msgstr "Starta nedladdningen"
 
-#: statistics.c:780
+#: statistics-gtk.c:532
 msgid "Statistics"
 msgstr "Statistik"
 
-#: statistics.c:716
+#: statistics-gtk.c:468
 #, c-format
 msgid "Statistics %s"
 msgstr "Statistik %s"
 
-#: gtk-gui.c:1635
+#: gtk-gui.c:1884
 msgid "Stats"
 msgstr "Statistik"
 
-#: webservice.c:264
+#: webservice.c:295
 msgid "Status"
 msgstr "Status"
 
-#: planner.c:580
+#: planner.c:551
 #, c-format
 msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s\n"
 
-#: parse-xml.c:397
+#: parse-xml.c:443
 #, c-format
 msgid "Strange percentage reading %s\n"
 msgstr "Konstig procent läsning %s\n"
 
-#: divelist.c:1421 gtk-gui.c:697 info.c:806 info.c:1259
+#: divelist-gtk.c:823 gtk-gui.c:840 info-gtk.c:588 info-gtk.c:1008
 msgid "Suit"
 msgstr "Dräkt"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:62
+#: main.c:68
 msgid "Sun"
 msgstr "sön"
 
-#: statistics.c:840
+#: statistics-gtk.c:592
 msgid "Surf Intv"
 msgstr "Ytintervall"
 
-#: planner.c:1317
+#: planner-gtk.c:383
 msgid "Surface Pressure (mbar)"
 msgstr "Lufttryck på ytan (mbar)"
 
-#: planner.c:591
+#: planner.c:562
 #, c-format
 msgid "Switch gas to %s\n"
 msgstr "Byt till gas %s\n"
 
-#: print.c:897
+#: print.c:960
 msgid "Table print"
 msgstr "Tabellutskrift"
 
+#: info-gtk.c:632
+msgid "Tags are only shown if they are identical for all edited dives"
+msgstr "Taggar visas bara om de är identiska för alla dyk"
+
 #: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Tankbyte rekommenderat"
@@ -1537,58 +1679,58 @@ msgstr "Tankbyte rekommenderat"
 msgid "Tank Pressure Info"
 msgstr "Info: flasktryck"
 
-#: gtk-gui.c:727
+#: gtk-gui.c:880
 msgid "Tec Settings"
 msgstr "Tekniska inställningar"
 
-#: gtk-gui.c:672
+#: gtk-gui.c:815
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:799
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:1404
+#: gtk-gui.c:1646
 msgid "Three"
 msgstr "Alla"
 
-#: main.c:62
+#: main.c:68
 msgid "Thu"
 msgstr "tor"
 
-#: info.c:1116
+#: info-gtk.c:838
 msgid "Time"
 msgstr "Tid"
 
-#: gtk-gui.c:1521
+#: gtk-gui.c:1768
 msgid ""
 "To edit dive information\n"
 "double click on it in the dive list"
 msgstr "Dubbelklicka på dyklistan för att ändra dykinformation"
 
-#: gtk-gui.c:1414
+#: gtk-gui.c:1656
 msgid "Toggle Zoom"
 msgstr "Zoom av/på"
 
-#: planner.c:217
+#: planner.c:286
 msgid "Too many gas mixes"
 msgstr "För många gasblandningar"
 
-#: planner.c:1253
+#: planner-gtk.c:317
 msgid "Too many waypoints"
 msgstr "För många etapper"
 
-#: statistics.c:179
+#: statistics-gtk.c:96
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:799
+#: statistics-gtk.c:551
 msgid "Total Time"
 msgstr "Total tid"
 
@@ -1597,24 +1739,24 @@ msgstr "Total tid"
 msgid "Total Weight:"
 msgstr "Total vikt:"
 
-#: planner.c:571
+#: planner.c:542
 #, c-format
 msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
 msgstr "Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %s\n"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:298
+#: divelist.c:583
 #, 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)"
 msgstr[0] "Resa %1$s, %3$d %2$s, %4$d (%5$d dyk)"
 msgstr[1] "Resa %1$s, %3$d %2$s, %4$d (%5$d dyk)"
 
-#: main.c:62
+#: main.c:68
 msgid "Tue"
 msgstr "tis"
 
-#: equipment.c:1453 equipment.c:1481
+#: equipment.c:1516 equipment.c:1544
 msgid "Type"
 msgstr "Typ"
 
@@ -1623,20 +1765,14 @@ msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
 "and click 'Retry'"
-msgstr ""
-"Uemis Zurich: Filsystem är nästan fullt\n"
-"Återanslut dykdatorn och försök\n"
-"igen"
+msgstr "Uemis Zurich: Filsystem är nästan fullt\nÅteranslut dykdatorn och försök\nigen"
 
 #: uemis-downloader.c:29
 msgid ""
 "Uemis Zurich: File System is full\n"
 "Disconnect/reconnect the dive computer\n"
 "and try again"
-msgstr ""
-"Uemis Zurich: Fullt filsystem\n"
-"Återanslut dykdatorn och försök\n"
-"igen"
+msgstr "Uemis Zurich: Fullt filsystem\nÅteranslut dykdatorn och försök\nigen"
 
 #: uemis-downloader.c:771
 msgid "Uemis init failed"
@@ -1656,115 +1792,119 @@ msgstr "Kan inte skapa parser för %s %s"
 msgid "Unable to open %s %s (%s)"
 msgstr "Kunde inte öppna fil %s %s (%s)"
 
-#: gtk-gui.c:635
+#: gtk-gui.c:778
 msgid "Units"
 msgstr "Enheter"
 
-#: gps.c:218
+#: divelist-gtk.c:1659
+msgid "Upload dive(s) to divelogs.de"
+msgstr "Ladda upp dyk till divelogs.de"
+
+#: webservice.c:318
+msgid "Upload to divelogs.de"
+msgstr "Ladda upp till divelogs.de"
+
+#: gtk-gui.c:1627
+msgid "Upload to divelogs.de..."
+msgstr "Ladda upp till divelogs.de..."
+
+#: gps.c:212
 msgid "Use right click to mark dive location at cursor"
 msgstr "Högerklicka för att markera dykmål vid muspekaren"
 
-#: webservice.c:251
+#: webservice.c:282 webservice.c:333
 msgid "User Identifier"
 msgstr "Användar ID"
 
-#: gtk-gui.c:1400
+#: gtk-gui.c:1642
 msgid "User Manual"
 msgstr "Användarmanual"
 
-#: gtk-gui.c:1377
+#: gtk-gui.c:1614
 msgid "View"
 msgstr "Visa"
 
-#: info.c:811 statistics.c:848
+#: info-gtk.c:593 statistics-gtk.c:600
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: gtk-gui.c:651
+#: gtk-gui.c:794
 msgid "Volume:"
 msgstr "Volym:"
 
-#: info.c:652
+#: info.c:312
 msgid "W"
 msgstr "W"
 
-#: planner.c:372
+#: planner-gtk.c:162
 msgid "Warning - extremely long dives can cause long calculation time"
 msgstr "Varning - extremt långa dyk kan ta lång tid att beräkna"
 
-#: planner.c:1081
+#: planner-gtk.c:137
 msgid "Warning - planning very deep dives can take excessive amounts of time"
 msgstr "Varning - att planera väldigt djupa dyk kan ta väldigt lång tid"
 
-#: statistics.c:854
+#: statistics-gtk.c:606
 msgid "Water Temp"
 msgstr "Vattentemperatur"
 
-#: webservice.c:153
+#: webservice.c:163
 msgid "Webservice"
 msgstr "Webbtjänst"
 
-#: main.c:62
+#: main.c:68
 msgid "Wed"
 msgstr "ons"
 
-#: equipment.c:986 equipment.c:1580 gtk-gui.c:692
+#: equipment.c:1049 equipment.c:1643 gtk-gui.c:835
 msgid "Weight"
 msgstr "Vikt"
 
-#: equipment.c:1085 print.c:308
+#: equipment.c:1148 print.c:308
 #, c-format
 msgid "Weight System"
 msgstr "Viktsystem"
 
-#: gtk-gui.c:661
+#: gtk-gui.c:804
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: gtk-gui.c:135
+#: gtk-gui.c:152
 msgid "XML file"
 msgstr "XML-fil"
 
-#: statistics.c:175
+#: statistics-gtk.c:92
 msgid "Year"
 msgstr "År"
 
-#: gtk-gui.c:1393 statistics.c:384
+#: gtk-gui.c:1634 statistics-gtk.c:295
 msgid "Yearly Statistics"
 msgstr "Årsstatistik"
 
-#: gtk-gui.c:2007
+#: gtk-gui.c:2382
 #, c-format
 msgid ""
 "You already have a dive computer of this model\n"
 "named %s\n"
 "Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
 "If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
-msgstr ""
-"Du äger redan en dydator av denna modell\n"
-"med namnet %s\n"
-"Subsurface kan namnge den nya dykdatorn så att du kan lätt skilja dem åt. Det förvalda namnet är modellen och enhetens ID som visas nedan.\n"
-"Om du inte vill ge ett nytt namn åt datorn, tryck 'Avbryt'. Subsurface kommer att endast visa modellnamnet (vilket kan göra det svårt att skilja två dykdatorer av samma modell)."
+msgstr "Du äger redan en dydator av denna modell\nmed namnet %s\nSubsurface kan namnge den nya dykdatorn så att du kan lätt skilja dem åt. Det förvalda namnet är modellen och enhetens ID som visas nedan.\nOm du inte vill ge ett nytt namn åt datorn, tryck 'Avbryt'. Subsurface kommer att endast visa modellnamnet (vilket kan göra det svårt att skilja två dykdatorer av samma modell)."
 
-#: gtk-gui.c:220
+#: gtk-gui.c:237
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Du har ändringer som inte är sparade.\n"
-"Vill du spara dem innan du stänger datafilen?"
+msgstr "Du har ändringer som inte är sparade.\nVill du spara dem innan du stänger datafilen?"
 
-#: gtk-gui.c:223 gtk-gui.c:226
+#: gtk-gui.c:240 gtk-gui.c:243
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
 "Would you like to save those before closing the datafile?"
-msgstr ""
-"Du har ändringer som inte är sparade i %s.\n"
-"Vill du spara dem innan du stänger datafilen?"
+msgstr "Du har ändringer som inte är sparade i %s.\nVill du spara dem innan du stänger datafilen?"
 
-#: divelist.c:574 planner.c:127 planner.c:798 planner.c:799 print.c:178
-#: profile.c:400
+#: divelist-gtk.c:467 planner.c:86 planner.c:778 planner.c:779 print.c:178
+#: profile.c:415
 #, c-format
 msgid "air"
 msgstr "luft"
@@ -1773,7 +1913,11 @@ msgstr "luft"
 msgid "airtime"
 msgstr "gastid"
 
-#: equipment.c:829
+#: statistics.c:21
+msgid "altitude"
+msgstr "höjd"
+
+#: equipment.c:892
 msgid "ankle"
 msgstr "ankel"
 
@@ -1781,22 +1925,34 @@ msgstr "ankel"
 msgid "ascent"
 msgstr "uppstigning"
 
-#: equipment.c:830
+#: equipment.c:893
 msgid "backplate weight"
 msgstr "Ryggplattans vikt"
 
-#: dive.c:46
+#: dive.c:48
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:828
+#: equipment.c:891
 msgid "belt"
 msgstr "bälte"
 
-#: libdivecomputer.c:150
+#: statistics.c:20
+msgid "boat"
+msgstr "båt"
+
+#: gtk-gui.c:2135 libdivecomputer.c:150
 msgid "bookmark"
 msgstr "bokmärke"
 
+#: statistics.c:21
+msgid "cave"
+msgstr "grotta"
+
+#: statistics.c:20
+msgid "cavern"
+msgstr "cavern"
+
 #: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "ceiling"
@@ -1805,11 +1961,11 @@ msgstr "ceiling"
 msgid "ceiling (safety stop)"
 msgstr "ceiling (säkerhetsstopp)"
 
-#: equipment.c:831
+#: equipment.c:894
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:91 planner.c:966
+#: dive.c:93 planner.c:951
 msgid "cuft"
 msgstr "ft³"
 
@@ -1821,6 +1977,10 @@ msgstr "data"
 msgid "deco stop"
 msgstr "dekostopp"
 
+#: statistics.c:20
+msgid "deep"
+msgstr "djup"
+
 #: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "djupstopp"
@@ -1837,40 +1997,48 @@ msgstr "dykplats ID"
 msgid "divetime"
 msgstr "dyktid"
 
+#: statistics.c:20
+msgid "drift"
+msgstr "ström"
+
 #: uemis-downloader.c:589
 msgid "drysuit"
 msgstr "torrdräkt"
 
-#: planner.c:800
+#: planner.c:780
 msgid "ean"
 msgstr "ean"
 
-#: statistics.c:687
+#: statistics.c:263
 #, c-format
 msgid "for all dives"
 msgstr "för alla dyk"
 
-#: statistics.c:683
+#: statistics.c:259
 #, c-format
 msgid "for dive #%d"
 msgstr "Dyk #%d "
 
-#: statistics.c:642
+#: statistics.c:217
 #, c-format
 msgid "for dives #"
 msgstr "för dykningar #"
 
-#: statistics.c:685
+#: statistics.c:261
 #, c-format
 msgid "for selected dive"
 msgstr "för valt dyk"
 
-#: statistics.c:649
+#: statistics.c:224
 #, c-format
 msgid "for selected dives"
 msgstr "för utvalda dyk"
 
-#: dive.c:117 divelist.c:1417 info.c:1178 planner.c:904
+#: statistics.c:22
+msgid "freshwater"
+msgstr "sötvatten"
+
+#: dive.c:119 divelist-gtk.c:819 info-gtk.c:918 info-gtk.c:929 planner.c:889
 msgid "ft"
 msgstr "ft"
 
@@ -1886,10 +2054,18 @@ msgstr "gasbyte"
 msgid "heading"
 msgstr "riktning"
 
-#: equipment.c:827
+#: statistics.c:21
+msgid "ice"
+msgstr "is"
+
+#: equipment.c:890
 msgid "integrated"
 msgstr "integrerat"
 
+#: statistics.c:20
+msgid "invalid"
+msgstr "ogiltig"
+
 #: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "okänt händelsenummer"
@@ -1898,15 +2074,19 @@ msgstr "okänt händelsenummer"
 msgid "jacket"
 msgstr "jacka"
 
-#: dive.c:141 equipment.c:1005 gtk-gui.c:662
+#: dive.c:143 equipment.c:1068 gtk-gui.c:805
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:86
+#: dive.c:88
 msgid "l"
 msgstr "l"
 
-#: dive.c:137 divelist.c:1420 equipment.c:1007 gtk-gui.c:663
+#: statistics.c:21
+msgid "lake"
+msgstr "sjö"
+
+#: dive.c:139 divelist-gtk.c:822 equipment.c:1070 gtk-gui.c:806
 msgid "lbs"
 msgstr "pund"
 
@@ -1914,15 +2094,15 @@ msgstr "pund"
 msgid "long john"
 msgstr "Longjohn"
 
-#: dive.c:112 info.c:1178
+#: dive.c:114 info-gtk.c:918 info-gtk.c:929
 msgid "m"
 msgstr "m"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:966
 msgid "max ppO2"
 msgstr "max ppO2"
 
-#: divelist.c:1426 gtk-gui.c:740
+#: divelist-gtk.c:828 gtk-gui.c:893
 msgid "maxCNS"
 msgstr "maxCNS"
 
@@ -1934,7 +2114,7 @@ msgstr "Maxdjup"
 msgid "membrane"
 msgstr "membran"
 
-#: divelist.c:1418 planner.c:972
+#: divelist-gtk.c:820 planner.c:957
 msgid "min"
 msgstr "Min"
 
@@ -1947,11 +2127,15 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgid "more data dive id"
 msgstr "mer data dive id"
 
-#: statistics.c:516
+#: statistics.c:198
 #, c-format
 msgid "more than %d days"
 msgstr "mer än %d dagar"
 
+#: statistics.c:22
+msgid "night"
+msgstr "natt"
+
 #: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "non stop tid"
@@ -1960,25 +2144,33 @@ msgstr "non stop tid"
 msgid "none"
 msgstr "inget"
 
-#: gtk-gui.c:796
+#: gtk-gui.c:949
 msgid "pHe threshold"
 msgstr "pHe tröskel"
 
-#: gtk-gui.c:778
+#: gtk-gui.c:931
 #, c-format
 msgid "pN%s threshold"
 msgstr "pN%s tröskel"
 
-#: gtk-gui.c:759
+#: gtk-gui.c:912
 #, c-format
 msgid "pO%s threshold"
 msgstr "pO%s tröskel"
 
-#: dive.c:42
+#: dive.c:44
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:50
+#: statistics.c:23
+msgid "photo"
+msgstr "foto"
+
+#: statistics.c:21
+msgid "pool"
+msgstr "pool"
+
+#: dive.c:52
 msgid "psi"
 msgstr "psi"
 
@@ -1990,6 +2182,10 @@ msgstr "rbt"
 msgid "rgbm"
 msgstr "rgbm"
 
+#: statistics.c:22
+msgid "river"
+msgstr "älv"
+
 #: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "säkerhetsstopp"
@@ -2006,6 +2202,10 @@ msgstr "säkerhetsstopp (frivilligt)"
 msgid "semidry"
 msgstr "semidry"
 
+#: statistics.c:20
+msgid "shore"
+msgstr "strand"
+
 #: uemis-downloader.c:590
 msgid "shorty"
 msgstr "shorty"
@@ -2014,26 +2214,34 @@ msgstr "shorty"
 msgid "surface"
 msgstr "ytan"
 
+#: statistics.c:22
+msgid "teaching"
+msgstr "undervisning"
+
 #: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "vävnadsnivå"
 
-#. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:1075
+#: statistics.c:22
+msgid "training"
+msgstr "utbildning"
+
+#. ++GETTEXT the term translator-credits is magic - list the names of the
+#. tranlators here
+#: gtk-gui.c:1292
 msgid "translator-credits"
-msgstr ""
-"Linus Torvalds\n"
-"Fredrik Steen"
+msgstr "Linus Torvalds\nFredrik Steen"
 
 #: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "sändare"
 
-#: equipment.c:1346 equipment.c:1366
+#: equipment.c:1409 equipment.c:1429
 msgid "unkn"
 msgstr "okänd"
 
-#: libdivecomputer.c:152 print.c:321 statistics.c:562 uemis-downloader.c:133
+#: equipment.c:649 libdivecomputer.c:152 print.c:321 statistics-gtk.c:361
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "okänd"
 
@@ -2045,11 +2253,15 @@ msgstr "inte specifierad"
 msgid "vest"
 msgstr "väst"
 
+#: statistics.c:23
+msgid "video"
+msgstr "video"
+
 #: libdivecomputer.c:150
 msgid "violation"
 msgstr "kränkning"
 
-#: equipment.c:1482
+#: equipment.c:1545
 msgid "weight"
 msgstr "Vikt"
 
@@ -2061,23 +2273,6 @@ msgstr "våtdräkt"
 msgid "workload"
 msgstr "arbetsbelastning"
 
-#~ msgid "1 dive per page"
-#~ msgstr "1 dyk per sida"
-
-#~ msgid "About"
-#~ msgstr "Om"
-
-#~ msgid "Automatically group dives in trips"
-#~ msgstr "Gruppera dyk som resor automatisk"
-
-#~ msgid "Delete"
-#~ msgstr "Radera"
-
-#~ msgid "Dive details"
-#~ msgstr "Detaljer"
-
-#~ msgid "Pretty print"
-#~ msgstr "Prydlig utskrift"
-
-#~ msgid "ZIP file"
-#~ msgstr "ZIP-fil"
+#: statistics.c:21
+msgid "wreck"
+msgstr "vrak"
author	Dirk Hohndel <dirk@hohndel.org>	2013-04-30 10:13:31 -0700
committer	Dirk Hohndel <dirk@hohndel.org>	2013-04-30 11:01:13 -0700
commit	2af4014c1e68d9045f37af3c601d550ab6b9723f (patch)
tree	8ed65e11a61f92aad63a99697d2e7cc6779072b7 /po
parent	172982b86038812e8914d1017c910168cf80e640 (diff)
download	subsurface-2af4014c1e68d9045f37af3c601d550ab6b9723f.tar.gz