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>

1 files changed, 683 insertions, 533 deletions

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"