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, 685 insertions, 535 deletions

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"