Handle dates and a "calculated plural" in translations

This looks like a massive commit mainly because of the line number changes
in the .po files. That sadly hides what really happened here:

- the places where we manually build dates have now been localized
- the one place where we did the English "calculated plural" has been
  modified so that it now can be correctly translated (in English this
  just adds an 's' to the noun if the number is != 1 - in other languages
  this tends to be much more complicated)

I then updated the two German translations to take advantage of the new
constructs. And while I was at it, I changed the translation Trip->Gruppe
to Trip->Reise as that seemed much more appropriate.
I also fixed another error in the German translation where I translated
"dive time" as "Startzeit" - but in the context it was "Dauer".

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 181 insertions, 148 deletions

diff --git a/po/nb_NO.po b/po/nb_NO.po
index 5912a7ffa..8a2a1fceb 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
 "PO-Revision-Date: 2012-10-15 08:14+0100\n"
 "Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
 "Language-Team: Norwegian Bokmål\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
 msgid " > Month"
 msgstr " > Måned"
 
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
 msgid " Please select dive computer and device. "
 msgstr " Velg dykkecomputer og enhet"
 
@@ -32,22 +32,46 @@ msgstr " Velg dykkecomputer og enhet"
 msgid "#"
 msgstr "#"
 
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Dykk #%d - %s %02d-%02d-%04d,  %d:%02d"
+
+#: print.c:254 statistics.c:536
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:499
+#: statistics.c:507
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dt %dt %dmin"
 
-#: statistics.c:501
+#: statistics.c:509
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dt %dmin"
@@ -57,19 +81,19 @@ msgstr "%dt %dmin"
 msgid "(%s) or (%s)"
 msgstr "(%s) eller (%s)"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:920
 msgid "About"
 msgstr "Om"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:914
 msgid "Add Dive"
 msgstr "Nytt dykk"
 
-#: divelist.c:2019
+#: divelist.c:2022
 msgid "Add dive"
 msgstr "Nytt dykk"
 
-#: divelist.c:2098
+#: divelist.c:2101
 msgid "Add to trip above"
 msgstr "Slå sammen med turen over"
 
@@ -81,11 +105,11 @@ msgstr "apr"
 msgid "Aug"
 msgstr "aug"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:929
 msgid "Autogroup"
 msgstr "Grupper automatisk"
 
-#: gtk-gui.c:662
+#: gtk-gui.c:664
 msgid "Automatically group dives in trips"
 msgstr "Grupper dykk som turer automatisk"
 
@@ -109,59 +133,59 @@ msgctxt "Temp"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
 msgid "Avg Depth"
 msgstr "Snittdybde"
 
-#: statistics.c:691
+#: statistics.c:700
 msgid "Avg SAC"
 msgstr "Snitt-SAC"
 
-#: statistics.c:666
+#: statistics.c:675
 msgid "Avg Temp"
 msgstr "Snitt-temp."
 
-#: statistics.c:673
+#: statistics.c:682
 msgid "Avg Time"
 msgstr "Snitt-tid"
 
-#: gtk-gui.c:590
+#: gtk-gui.c:592
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
 msgid "Buddy"
 msgstr "Buddy"
 
-#: gtk-gui.c:600
+#: gtk-gui.c:602
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:520
+#: gtk-gui.c:522
 msgid "Choose Default XML File"
 msgstr "Velg standard XML-fil"
 
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Velg hvilke XML-filer du vil importere"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:910
 msgid "Close"
 msgstr "Lukk"
 
-#: divelist.c:2115
+#: divelist.c:2118
 msgid "Collapse all"
 msgstr "Slå sammen alle"
 
-#: divelist.c:2088
+#: divelist.c:2091
 msgid "Create new trip above"
 msgstr "Lag ny tur over denne"
 
-#: gtk-gui.c:596
+#: gtk-gui.c:598
 msgid "CuFt"
 msgstr "ft^3"
 
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
 msgid "Cyl"
 msgstr "Flaske"
 
@@ -173,15 +197,15 @@ msgstr "Flaske"
 msgid "Cylinders"
 msgstr "Flasker"
 
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
 msgid "Date"
 msgstr "Dato"
 
-#: info.c:776
+#: info.c:780
 msgid "Date and Time"
 msgstr "Dato og tid"
 
-#: info.c:786
+#: info.c:790
 msgid "Date:"
 msgstr "Dato:"
 
@@ -189,31 +213,31 @@ msgstr "Dato:"
 msgid "Dec"
 msgstr "des"
 
-#: gtk-gui.c:667
+#: gtk-gui.c:669
 msgid "Default XML Data File"
 msgstr "Standard XML-fil"
 
-#: info.c:227
+#: info.c:229
 msgid "Delete"
 msgstr "Slett"
 
-#: info.c:178
+#: info.c:180
 msgid "Delete Dive"
 msgstr "Slett dykk"
 
-#: divelist.c:2006
+#: divelist.c:2009
 msgid "Delete dive"
 msgstr "Slett dykk"
 
-#: divelist.c:2005
+#: divelist.c:2008
 msgid "Delete dives"
 msgstr "Slett dykk"
 
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
 msgid "Depth"
 msgstr "Dybde"
 
-#: info.c:836
+#: info.c:840
 #, c-format
 msgid "Depth (%s):"
 msgstr "Dybde (%s):"
@@ -222,38 +246,39 @@ msgstr "Dybde (%s):"
 msgid "Depth Limit Exceeded"
 msgstr "Maksgrense for dybde overskredet"
 
-#: gtk-gui.c:584
+#: gtk-gui.c:586
 msgid "Depth:"
 msgstr "Dybde:"
 
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
 msgid "Device name"
 msgstr "Enhetsnavn"
 
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Dykk #%d - %s %02d-%02d-%04d,  %d:%02d"
+
 #: print.c:67
 #, c-format
 msgid "Dive #%d - "
 msgstr "Dykk #%d - "
 
-#: info.c:144
+#: info.c:146
 #, c-format
 msgid "Dive #%d - %s"
 msgstr "Dykk #%d - %s"
 
-#: info.c:106
-#, c-format
-msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
-msgstr "Dykk #%d - %s %02d-%02d-%04d,  %d:%02d"
-
-#: gtk-gui.c:1120 info.c:669 statistics.c:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
 msgid "Dive Info"
 msgstr "Informasjon"
 
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
 msgid "Dive Notes"
 msgstr "Dykk"
 
-#: statistics.c:712
+#: statistics.c:721
 msgid "Dive Time"
 msgstr "Starttid"
 
@@ -265,35 +290,35 @@ msgstr "Alarm: dykketid"
 msgid "Dive Time Info"
 msgstr "Info: dykketid"
 
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
 msgid "Dive computer"
 msgstr "Dykkecomputer"
 
-#: print.c:474
+#: print.c:476
 msgid "Dive details"
 msgstr "Detaljer"
 
-#: info.c:483
+#: info.c:487
 msgid "Dive master"
 msgstr "Divemaster"
 
-#: print.c:154
+#: print.c:155
 msgid "Dive#"
 msgstr "Dykk nr."
 
-#: gtk-gui.c:650
+#: gtk-gui.c:652
 msgid "Divelist Font"
 msgstr "Skrifttype for liste"
 
-#: info.c:910
+#: info.c:914
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:663
+#: statistics.c:672
 msgid "Dives"
 msgstr "Dykk"
 
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
 msgid "Download From Dive Computer"
 msgstr "Last ned fra dykkecomputer"
 
@@ -301,39 +326,39 @@ msgstr "Last ned fra dykkecomputer"
 msgid "Duration"
 msgstr "Varighet"
 
-#: info.c:831
+#: info.c:835
 msgid "Duration (min)"
 msgstr "Varighet (min)"
 
-#: info.c:228
+#: info.c:230
 msgid "Edit"
 msgstr "Rediger"
 
-#: info.c:628
+#: info.c:632
 msgid "Edit Trip Info"
 msgstr "Rediger turinformasjon"
 
-#: divelist.c:2027
+#: divelist.c:2030
 msgid "Edit Trip Summary"
 msgstr "Rediger tursammendrag"
 
-#: divelist.c:2003
+#: divelist.c:2006
 msgid "Edit dive"
 msgstr "Rediger dykk"
 
-#: divelist.c:2002
+#: divelist.c:2005
 msgid "Edit dives"
 msgstr "Rediger dykk"
 
-#: info.c:471
+#: info.c:475
 msgid "Edit multiple dives"
 msgstr "Rediger flere dykk"
 
-#: info.c:453
+#: info.c:455
 msgid "Edit trip summary"
 msgstr "Rediger tursammendrag"
 
-#: gtk-gui.c:771
+#: gtk-gui.c:773
 msgid "Enable / Disable Events"
 msgstr "Skru på/av hendelser"
 
@@ -341,15 +366,15 @@ msgstr "Skru på/av hendelser"
 msgid "End"
 msgstr "Slutt"
 
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
 msgid "Equipment"
 msgstr "Utstyr"
 
-#: divelist.c:2112
+#: divelist.c:2115
 msgid "Expand all"
 msgstr "Ekspander alle"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:603
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
@@ -358,12 +383,12 @@ msgstr "Fahrenheit"
 msgid "Failed to open %i files."
 msgstr "Fikk ikke åpnet %i filer."
 
-#: parse-xml.c:1471
+#: parse-xml.c:1498
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Kunne ikke lese '%s'"
 
-#: parse-xml.c:1466
+#: parse-xml.c:1493
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Kunne ikke lese '%s'.\n"
@@ -382,15 +407,15 @@ msgstr "Kunne ikke åpne '%s'.\n"
 msgid "Feb"
 msgstr "feb"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:588
 msgid "Feet"
 msgstr "fot"
 
-#: gtk-gui.c:899
+#: gtk-gui.c:901
 msgid "File"
 msgstr "Fil"
 
-#: gtk-gui.c:902
+#: gtk-gui.c:904
 msgid "Filter"
 msgstr "Filter"
 
@@ -398,7 +423,7 @@ msgstr "Filter"
 msgid "Fri"
 msgstr "fre"
 
-#: statistics.c:730
+#: statistics.c:739
 msgid "Gas Used"
 msgstr "Gass brukt"
 
@@ -406,15 +431,15 @@ msgstr "Gass brukt"
 msgid "Gasmix"
 msgstr "Gassmiks"
 
-#: gtk-gui.c:903
+#: gtk-gui.c:905
 msgid "Help"
 msgstr "Hjelp"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:912
 msgid "Import XML File(s)"
 msgstr "Importer XML-fil(er)"
 
-#: gtk-gui.c:921
+#: gtk-gui.c:923
 msgid "Info"
 msgstr "Info"
 
@@ -431,23 +456,23 @@ msgstr "jul"
 msgid "Jun"
 msgstr "jun"
 
-#: gtk-gui.c:854
+#: gtk-gui.c:856
 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
 msgstr "Linus Torvalds, Dirk Hohndel med flere, 2011, 2012"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:921
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:595
+#: gtk-gui.c:597
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
 msgid "Location"
 msgstr "Sted"
 
-#: gtk-gui.c:900
+#: gtk-gui.c:902
 msgid "Log"
 msgstr "Logg"
 
@@ -456,7 +481,7 @@ msgctxt "Duration"
 msgid "Longest"
 msgstr "Lengste"
 
-#: statistics.c:674
+#: statistics.c:683
 msgid "Longest Dive"
 msgstr "Lengste dykk"
 
@@ -476,7 +501,7 @@ msgstr "mar"
 msgid "Marker"
 msgstr "markering"
 
-#: print.c:154
+#: print.c:155
 msgid "Master"
 msgstr "master"
 
@@ -484,19 +509,19 @@ msgstr "master"
 msgid "Max Deco Time Warning"
 msgstr "Advarsel: maks dekotid"
 
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
 msgid "Max Depth"
 msgstr "Maks. dybde"
 
-#: statistics.c:689
+#: statistics.c:698
 msgid "Max SAC"
 msgstr "Maks. SAC"
 
-#: statistics.c:664
+#: statistics.c:673
 msgid "Max Temp"
 msgstr "Maks. temp."
 
-#: print.c:94
+#: print.c:95
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -530,27 +555,27 @@ msgstr "Maksimum"
 msgid "May"
 msgstr "mai"
 
-#: divelist.c:2035
+#: divelist.c:2038
 msgid "Merge trip with trip above"
 msgstr "Slå samme tur med turen over"
 
-#: divelist.c:2045
+#: divelist.c:2048
 msgid "Merge trip with trip below"
 msgstr "Slå sammen tur med turen under"
 
-#: gtk-gui.c:585
+#: gtk-gui.c:587
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:682
+#: statistics.c:691
 msgid "Min Depth"
 msgstr "Min. dybde"
 
-#: statistics.c:690
+#: statistics.c:699
 msgid "Min SAC"
 msgstr "Min. SAC"
 
-#: statistics.c:665
+#: statistics.c:674
 msgid "Min Temp"
 msgstr "Min. temp"
 
@@ -569,7 +594,7 @@ msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:658
 msgid "Misc. Options"
 msgstr "Ymse valg"
 
@@ -577,15 +602,15 @@ msgstr "Ymse valg"
 msgid "Mon"
 msgstr "man"
 
-#: gtk-gui.c:851
+#: gtk-gui.c:853
 msgid "Multi-platform divelog software in C"
 msgstr "Dykkelogg i C for flere plattformer"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:906
 msgid "New"
 msgstr "Ny"
 
-#: gtk-gui.c:811
+#: gtk-gui.c:813
 msgid "New starting number"
 msgstr "Nytt startnummer"
 
@@ -593,7 +618,7 @@ msgstr "Nytt startnummer"
 msgid "No Tank Data"
 msgstr "Ingen tankinformasjon"
 
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
 msgid "Notes"
 msgstr "Notater"
 
@@ -601,7 +626,7 @@ msgstr "Notater"
 msgid "Nov"
 msgstr "nov"
 
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
 msgid "OTU"
 msgstr "OTU"
 
@@ -609,11 +634,11 @@ msgstr "OTU"
 msgid "Oct"
 msgstr "okt"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:907
 msgid "Open"
 msgstr "Åpne"
 
-#: gtk-gui.c:313
+#: gtk-gui.c:315
 msgid "Open File"
 msgstr "Åpne fil"
 
@@ -629,11 +654,11 @@ msgstr "Advarsel: oppstigning /PO2"
 msgid "PO2 Green Warning"
 msgstr "Advarsel: grønn / PO2"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:593
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
 msgid "Preferences"
 msgstr "Valg"
 
@@ -641,35 +666,35 @@ msgstr "Valg"
 msgid "Pressure"
 msgstr "Trykk"
 
-#: gtk-gui.c:589
+#: gtk-gui.c:591
 msgid "Pressure:"
 msgstr "Trykk:"
 
-#: print.c:484
+#: print.c:486
 msgid "Pretty print"
 msgstr "Pen utskrift"
 
-#: gtk-gui.c:909
+#: gtk-gui.c:911
 msgid "Print"
 msgstr "Skriv ut"
 
-#: print.c:505
+#: print.c:507
 msgid "Print only selected dives"
 msgstr "Skriv ut valgte dykk"
 
-#: print.c:500
+#: print.c:502
 msgid "Print selection"
 msgstr "Skriv ut valg"
 
-#: print.c:478
+#: print.c:480
 msgid "Print type"
 msgstr "Utskriftstype"
 
-#: gtk-gui.c:920
+#: gtk-gui.c:922
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:919
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -681,7 +706,7 @@ msgstr "Alarm: gjenværende gasstid"
 msgid "RGT Warning"
 msgstr "Advarsel: gjenværende gasstid"
 
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
 msgid "Rating"
 msgstr "Vurdering"
 
@@ -690,27 +715,27 @@ msgstr "Vurdering"
 msgid "Reading dive %s"
 msgstr "Leser dykk %s"
 
-#: divelist.c:2050
+#: divelist.c:2053
 msgid "Remove Trip"
 msgstr "Fjern tur"
 
-#: divelist.c:2106
+#: divelist.c:2109
 msgid "Remove dive from trip"
 msgstr "Fjern dykk fra tur"
 
-#: divelist.c:2104
+#: divelist.c:2107
 msgid "Remove selected dives from trip"
 msgstr "Fjern valgte dykk fra tur"
 
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
 msgid "Renumber"
 msgstr "Oppdater nummerering"
 
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
 msgid "SAC"
 msgstr "SAC"
 
@@ -726,11 +751,11 @@ msgstr "Brudd på sikkerhetsstopp"
 msgid "Sat"
 msgstr "lør"
 
-#: gtk-gui.c:906
+#: gtk-gui.c:908
 msgid "Save"
 msgstr "Lagre"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:909
 msgid "Save As"
 msgstr "Lagre som"
 
@@ -742,7 +767,7 @@ msgstr "Lagre endringer?"
 msgid "Save File As"
 msgstr "Lagre fil som"
 
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
 msgid "SelectEvents"
 msgstr "Velg hendelser"
 
@@ -763,11 +788,11 @@ msgctxt "Duration"
 msgid "Shortest"
 msgstr "Korteste"
 
-#: statistics.c:675
+#: statistics.c:684
 msgid "Shortest Dive"
 msgstr "Korteste dykk"
 
-#: gtk-gui.c:609
+#: gtk-gui.c:611
 msgid "Show Columns"
 msgstr "Vis kolonner"
 
@@ -787,15 +812,15 @@ msgstr "Advarsel: oppstigningshastighet"
 msgid "Start"
 msgstr "Start"
 
-#: statistics.c:655
+#: statistics.c:664
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
 msgid "Stats"
 msgstr "Statistikk"
 
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
 msgid "Suit"
 msgstr "Drakt"
 
@@ -804,11 +829,11 @@ msgstr "Drakt"
 msgid "Sun"
 msgstr "søn"
 
-#: statistics.c:713
+#: statistics.c:722
 msgid "Surf Intv"
 msgstr "Overflateintervall"
 
-#: print.c:488
+#: print.c:490
 msgid "Table print"
 msgstr "Tabellutskrift"
 
@@ -820,7 +845,7 @@ msgstr "Tankbytte foreslått"
 msgid "Tank Pressure Info"
 msgstr "Info: trykk"
 
-#: gtk-gui.c:615
+#: gtk-gui.c:617
 msgid "Temp"
 msgstr "Temp"
 
@@ -828,11 +853,11 @@ msgstr "Temp"
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:599
+#: gtk-gui.c:601
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:924
 msgid "Three"
 msgstr "Alle"
 
@@ -840,11 +865,11 @@ msgstr "Alle"
 msgid "Thu"
 msgstr "tor"
 
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
 msgid "Time"
 msgstr "Tid"
 
-#: gtk-gui.c:928
+#: gtk-gui.c:930
 msgid "Toggle Zoom"
 msgstr "Zoom av/på"
 
@@ -853,10 +878,18 @@ msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:672
+#: statistics.c:681
 msgid "Total Time"
 msgstr "Total tid"
 
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
 #: main.c:37
 msgid "Tue"
 msgstr "tir"
@@ -889,19 +922,19 @@ msgstr ""
 msgid "Uemis init failed"
 msgstr "Klarer ikke å lese fra Uemis"
 
-#: gtk-gui.c:577
+#: gtk-gui.c:579
 msgid "Units"
 msgstr "Enheter"
 
-#: gtk-gui.c:901
+#: gtk-gui.c:903
 msgid "View"
 msgstr "Vis"
 
-#: gtk-gui.c:594
+#: gtk-gui.c:596
 msgid "Volume:"
 msgstr "Volum:"
 
-#: statistics.c:721
+#: statistics.c:730
 msgid "Water Temp"
 msgstr "Vanntemperatur"
 
@@ -909,7 +942,7 @@ msgstr "Vanntemperatur"
 msgid "Wed"
 msgstr "ons"
 
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
 msgid "Weight"
 msgstr "Vekt"
 
@@ -917,7 +950,7 @@ msgstr "Vekt"
 msgid "Weight System"
 msgstr "Vektsystem"
 
-#: gtk-gui.c:604
+#: gtk-gui.c:606
 msgid "Weight:"
 msgstr "Vekt:"
 
@@ -929,7 +962,7 @@ msgstr "XML-fil"
 msgid "Year"
 msgstr "År"
 
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
 msgid "Yearly Statistics"
 msgstr "Årsstatistikk"
 
@@ -941,7 +974,7 @@ msgstr ""
 "Du har endringer som ikke er lagret.\n"
 "Vil du lagre disse før du lukker datafila?"
 
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -966,7 +999,7 @@ msgstr "belte"
 msgid "clip-on"
 msgstr "clip-on"
 
-#: divelist.c:1260
+#: divelist.c:1263
 msgid "ft"
 msgstr "ft"
 
@@ -974,19 +1007,19 @@ msgstr "ft"
 msgid "integrated"
 msgstr "integrert"
 
-#: gtk-gui.c:605
+#: gtk-gui.c:607
 msgid "kg"
 msgstr "kg"
 
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
 msgid "lbs"
 msgstr "pund"
 
-#: divelist.c:1261
+#: divelist.c:1264
 msgid "min"
 msgstr "Min"
 
-#: statistics.c:493
+#: statistics.c:501
 #, c-format
 msgid "more than %d days"
 msgstr "mer enn %d dager"
@@ -995,7 +1028,7 @@ msgstr "mer enn %d dager"
 msgid "unkn"
 msgstr "ukjent"
 
-#: statistics.c:532
+#: statistics.c:541
 msgid "unknown"
 msgstr "ukjent"