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/nl_NL.po b/po/nl_NL.po
index 9b1f3f845..0dfff2a46 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
 "PO-Revision-Date: 2012-10-11 13:08+0100\n"
 "Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
 "Language-Team: Dutch\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
 msgid " > Month"
 msgstr " > Maand"
 
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
 msgid " Please select dive computer and device. "
 msgstr " Selecteer duikcomputer en aansluiting. "
 
@@ -32,22 +32,46 @@ msgstr " Selecteer duikcomputer en aansluiting. "
 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 "Duik #%d - %s %02d/%02d/%04d om %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 %dst %dmin"
 
-#: statistics.c:501
+#: statistics.c:509
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dst %dmin"
@@ -57,19 +81,19 @@ msgstr "%dst %dmin"
 msgid "(%s) or (%s)"
 msgstr "(%s) of (%s)"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:920
 msgid "About"
 msgstr ""
 
-#: gtk-gui.c:912
+#: gtk-gui.c:914
 msgid "Add Dive"
 msgstr "Duik toevoegen"
 
-#: divelist.c:2019
+#: divelist.c:2022
 msgid "Add dive"
 msgstr "Duik Toevoegen"
 
-#: divelist.c:2098
+#: divelist.c:2101
 msgid "Add to trip above"
 msgstr "Trip hierboven toevoegen"
 
@@ -81,11 +105,11 @@ msgstr "Apr"
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:929
 msgid "Autogroup"
 msgstr "Automatisch groeperen"
 
-#: gtk-gui.c:662
+#: gtk-gui.c:664
 msgid "Automatically group dives in trips"
 msgstr "Automatisch de duiken in trips groeperen"
 
@@ -109,59 +133,59 @@ msgctxt "Temp"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
 msgid "Avg Depth"
 msgstr "Gem. diepte"
 
-#: statistics.c:691
+#: statistics.c:700
 msgid "Avg SAC"
 msgstr "Gem. gasverbruik"
 
-#: statistics.c:666
+#: statistics.c:675
 msgid "Avg Temp"
 msgstr "Gem. Temperatuur"
 
-#: statistics.c:673
+#: statistics.c:682
 msgid "Avg Time"
 msgstr "Gemiddelde tijd"
 
-#: 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 "Kies standaard XML bestand"
 
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Kies de XML bestanden om te importeren in huidig data bestand"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:910
 msgid "Close"
 msgstr ""
 
-#: divelist.c:2115
+#: divelist.c:2118
 msgid "Collapse all"
 msgstr "Alle uitklappen"
 
-#: divelist.c:2088
+#: divelist.c:2091
 msgid "Create new trip above"
 msgstr "Nieuwe trip hierboven invoegen"
 
-#: gtk-gui.c:596
+#: gtk-gui.c:598
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
 msgid "Cyl"
 msgstr "Fles"
 
@@ -173,15 +197,15 @@ msgstr "Fles"
 msgid "Cylinders"
 msgstr "Flessen"
 
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:776
+#: info.c:780
 msgid "Date and Time"
 msgstr "Datum en tijd"
 
-#: info.c:786
+#: info.c:790
 msgid "Date:"
 msgstr "Datum:"
 
@@ -189,31 +213,31 @@ msgstr "Datum:"
 msgid "Dec"
 msgstr "Dec"
 
-#: gtk-gui.c:667
+#: gtk-gui.c:669
 msgid "Default XML Data File"
 msgstr "Standaard XML bestand"
 
-#: info.c:227
+#: info.c:229
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: info.c:178
+#: info.c:180
 msgid "Delete Dive"
 msgstr "Duik verwijderen"
 
-#: divelist.c:2006
+#: divelist.c:2009
 msgid "Delete dive"
 msgstr "Duik verwijderen"
 
-#: divelist.c:2005
+#: divelist.c:2008
 msgid "Delete dives"
 msgstr "Duiken verwijderen"
 
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
 msgid "Depth"
 msgstr "Diepte"
 
-#: info.c:836
+#: info.c:840
 #, c-format
 msgid "Depth (%s):"
 msgstr "Diepte (%s):"
@@ -222,38 +246,39 @@ msgstr "Diepte (%s):"
 msgid "Depth Limit Exceeded"
 msgstr "Diepte Limiet overschreden"
 
-#: gtk-gui.c:584
+#: gtk-gui.c:586
 msgid "Depth:"
 msgstr "Diepte:"
 
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
 msgid "Device name"
 msgstr "Apparaatnaam"
 
+#. ++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 "Duik #%d - %s %02d/%02d/%04d om %d:%02d"
+
 #: print.c:67
 #, c-format
 msgid "Dive #%d - "
 msgstr "Duik #%d - "
 
-#: info.c:144
+#: info.c:146
 #, c-format
 msgid "Dive #%d - %s"
 msgstr "Duik #%d - %s"
 
-#: info.c:106
-#, c-format
-msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
-msgstr "Duik #%d - %s %02d/%02d/%04d om %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 "Duik informatie"
 
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
 msgid "Dive Notes"
 msgstr "Duiknotities"
 
-#: statistics.c:712
+#: statistics.c:721
 msgid "Dive Time"
 msgstr "Duiktijd"
 
@@ -265,35 +290,35 @@ msgstr "Alarm: Duiktijd"
 msgid "Dive Time Info"
 msgstr "Info: Duiktijd"
 
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
 msgid "Dive computer"
 msgstr "Duikcomputer"
 
-#: print.c:474
+#: print.c:476
 msgid "Dive details"
 msgstr "Duikdetails"
 
-#: info.c:483
+#: info.c:487
 msgid "Dive master"
 msgstr "Duik-instructeur"
 
-#: print.c:154
+#: print.c:155
 msgid "Dive#"
 msgstr "Duik Nr."
 
-#: gtk-gui.c:650
+#: gtk-gui.c:652
 msgid "Divelist Font"
 msgstr "Duiklijst Font"
 
-#: info.c:910
+#: info.c:914
 msgid "Divemaster"
 msgstr "Duik-instructeur"
 
-#: statistics.c:663
+#: statistics.c:672
 msgid "Dives"
 msgstr "Duiken"
 
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
 msgid "Download From Dive Computer"
 msgstr "Download uit duikcomputer"
 
@@ -301,39 +326,39 @@ msgstr "Download uit duikcomputer"
 msgid "Duration"
 msgstr "Duur"
 
-#: info.c:831
+#: info.c:835
 msgid "Duration (min)"
 msgstr "Duur (min)"
 
-#: info.c:228
+#: info.c:230
 msgid "Edit"
 msgstr "Bewerken"
 
-#: info.c:628
+#: info.c:632
 msgid "Edit Trip Info"
 msgstr "Trip informatie bewerken"
 
-#: divelist.c:2027
+#: divelist.c:2030
 msgid "Edit Trip Summary"
 msgstr "Trip overzicht bewerken"
 
-#: divelist.c:2003
+#: divelist.c:2006
 msgid "Edit dive"
 msgstr "Duik bewerken"
 
-#: divelist.c:2002
+#: divelist.c:2005
 msgid "Edit dives"
 msgstr "Duiken bewerken"
 
-#: info.c:471
+#: info.c:475
 msgid "Edit multiple dives"
 msgstr "Bewerk meerdere duiken"
 
-#: info.c:453
+#: info.c:455
 msgid "Edit trip summary"
 msgstr "Trip overzicht bewerken"
 
-#: gtk-gui.c:771
+#: gtk-gui.c:773
 msgid "Enable / Disable Events"
 msgstr "Inschakelen / uitschakelen Evenementen"
 
@@ -341,15 +366,15 @@ msgstr "Inschakelen / uitschakelen Evenementen"
 msgid "End"
 msgstr "Einde"
 
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: divelist.c:2112
+#: divelist.c:2115
 msgid "Expand all"
 msgstr "Alle uitklappen"
 
-#: 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 "Fout bij openen van  %i bestanden."
 
-#: parse-xml.c:1471
+#: parse-xml.c:1498
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Fout bij analyse van '%s'"
 
-#: parse-xml.c:1466
+#: parse-xml.c:1493
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Fout bij analyseren van '%s'.\n"
@@ -382,15 +407,15 @@ msgstr "Fout bij lezen van '%s'.\n"
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:588
 msgid "Feet"
 msgstr "Voet"
 
-#: gtk-gui.c:899
+#: gtk-gui.c:901
 msgid "File"
 msgstr "Bestand"
 
-#: gtk-gui.c:902
+#: gtk-gui.c:904
 msgid "Filter"
 msgstr "Filter"
 
@@ -398,7 +423,7 @@ msgstr "Filter"
 msgid "Fri"
 msgstr "Vr"
 
-#: statistics.c:730
+#: statistics.c:739
 msgid "Gas Used"
 msgstr "Gas verbruikt"
 
@@ -406,15 +431,15 @@ msgstr "Gas verbruikt"
 msgid "Gasmix"
 msgstr "Gasmengsel"
 
-#: gtk-gui.c:903
+#: gtk-gui.c:905
 msgid "Help"
 msgstr "Help"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:912
 msgid "Import XML File(s)"
 msgstr "Import XML bestand(en)"
 
-#: gtk-gui.c:921
+#: gtk-gui.c:923
 msgid "Info"
 msgstr "Informatie"
 
@@ -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 en anderen, 2011, 2012"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:921
 msgid "List"
 msgstr "Lijst"
 
-#: 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 "Locatie"
 
-#: gtk-gui.c:900
+#: gtk-gui.c:902
 msgid "Log"
 msgstr "Log"
 
@@ -456,7 +481,7 @@ msgctxt "Duration"
 msgid "Longest"
 msgstr "Langste"
 
-#: statistics.c:674
+#: statistics.c:683
 msgid "Longest Dive"
 msgstr "Langste duik"
 
@@ -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 "Warnung: Maximale Deco tijd"
 
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
 msgid "Max Depth"
 msgstr "Max. Diepte"
 
-#: statistics.c:689
+#: statistics.c:698
 msgid "Max SAC"
 msgstr "Max. Gasverbruik"
 
-#: statistics.c:664
+#: statistics.c:673
 msgid "Max Temp"
 msgstr "Max. Temp."
 
-#: print.c:94
+#: print.c:95
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -530,27 +555,27 @@ msgstr "Grootste"
 msgid "May"
 msgstr "Mei"
 
-#: divelist.c:2035
+#: divelist.c:2038
 msgid "Merge trip with trip above"
 msgstr "Trip met bovenstaande samenvoegen"
 
-#: divelist.c:2045
+#: divelist.c:2048
 msgid "Merge trip with trip below"
 msgstr "Trip met onderstaande samenvoegen"
 
-#: gtk-gui.c:585
+#: gtk-gui.c:587
 msgid "Meter"
 msgstr "Meter"
 
-#: statistics.c:682
+#: statistics.c:691
 msgid "Min Depth"
 msgstr "Min. diepte"
 
-#: statistics.c:690
+#: statistics.c:699
 msgid "Min SAC"
 msgstr "Min. Gasverbruik"
 
-#: statistics.c:665
+#: statistics.c:674
 msgid "Min Temp"
 msgstr "Min. Temp."
 
@@ -569,7 +594,7 @@ msgctxt "Temp"
 msgid "Minimum"
 msgstr "Kleinste"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:658
 msgid "Misc. Options"
 msgstr "Diverse opties"
 
@@ -577,15 +602,15 @@ msgstr "Diverse opties"
 msgid "Mon"
 msgstr "Ma"
 
-#: gtk-gui.c:851
+#: gtk-gui.c:853
 msgid "Multi-platform divelog software in C"
 msgstr "Multi-Platform Duikprogramma in C"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:906
 msgid "New"
 msgstr ""
 
-#: gtk-gui.c:811
+#: gtk-gui.c:813
 msgid "New starting number"
 msgstr "Nieuw begin nummer"
 
@@ -593,7 +618,7 @@ msgstr "Nieuw begin nummer"
 msgid "No Tank Data"
 msgstr "Geen fles informatie"
 
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
 msgid "Notes"
 msgstr "Notities"
 
@@ -601,7 +626,7 @@ msgstr "Notities"
 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 "Bestand openen"
 
-#: gtk-gui.c:313
+#: gtk-gui.c:315
 msgid "Open File"
 msgstr "Bestand openen"
 
@@ -629,11 +654,11 @@ msgstr "Waarschuwing: Opstijging / PO2"
 msgid "PO2 Green Warning"
 msgstr "Waarschuwing: PO2 Groen"
 
-#: 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 "Instellingen"
 
@@ -641,35 +666,35 @@ msgstr "Instellingen"
 msgid "Pressure"
 msgstr "Druk"
 
-#: gtk-gui.c:589
+#: gtk-gui.c:591
 msgid "Pressure:"
 msgstr "Druk:"
 
-#: print.c:484
+#: print.c:486
 msgid "Pretty print"
 msgstr "Mooi afdrukken"
 
-#: gtk-gui.c:909
+#: gtk-gui.c:911
 msgid "Print"
 msgstr "Afdrukken"
 
-#: print.c:505
+#: print.c:507
 msgid "Print only selected dives"
 msgstr "Alleen de geselecteerde duiken printen"
 
-#: print.c:500
+#: print.c:502
 msgid "Print selection"
 msgstr "Selectie afdrukken"
 
-#: print.c:478
+#: print.c:480
 msgid "Print type"
 msgstr "Print type"
 
-#: gtk-gui.c:920
+#: gtk-gui.c:922
 msgid "Profile"
 msgstr "Profiel"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:919
 msgid "Quit"
 msgstr ""
 
@@ -681,7 +706,7 @@ msgstr "Alarm: resterende Gas-tijd"
 msgid "RGT Warning"
 msgstr "Warnung: resterende Gas-tijd"
 
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
 msgid "Rating"
 msgstr "Waardering"
 
@@ -690,27 +715,27 @@ msgstr "Waardering"
 msgid "Reading dive %s"
 msgstr "Lezen duik %s"
 
-#: divelist.c:2050
+#: divelist.c:2053
 msgid "Remove Trip"
 msgstr "Trip verwijderen"
 
-#: divelist.c:2106
+#: divelist.c:2109
 msgid "Remove dive from trip"
 msgstr "Duik uit trip verwijderen"
 
-#: divelist.c:2104
+#: divelist.c:2107
 msgid "Remove selected dives from trip"
 msgstr "Geselecteerde duiken uit trip verwijderen"
 
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
 msgid "Renumber"
 msgstr "Hernummeren"
 
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
 msgid "Retry"
 msgstr "Opnieuw"
 
-#: 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 "Gas verbruiksratio"
 
@@ -726,11 +751,11 @@ msgstr "veiligheidsstop overtreding"
 msgid "Sat"
 msgstr "Za"
 
-#: gtk-gui.c:906
+#: gtk-gui.c:908
 msgid "Save"
 msgstr "Opslaan"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:909
 msgid "Save As"
 msgstr "Bestand opslaan als"
 
@@ -742,7 +767,7 @@ msgstr "Aanpassingen opslaan?"
 msgid "Save File As"
 msgstr "Bestand opslaan als"
 
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
 msgid "SelectEvents"
 msgstr "gebeurtenissen selecteren"
 
@@ -763,11 +788,11 @@ msgctxt "Duration"
 msgid "Shortest"
 msgstr "Kortste"
 
-#: statistics.c:675
+#: statistics.c:684
 msgid "Shortest Dive"
 msgstr "Kortste duik"
 
-#: gtk-gui.c:609
+#: gtk-gui.c:611
 msgid "Show Columns"
 msgstr "Kolommen afbeelden"
 
@@ -787,15 +812,15 @@ msgstr "Warnung: snelheid"
 msgid "Start"
 msgstr "Start"
 
-#: statistics.c:655
+#: statistics.c:664
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
 msgid "Stats"
 msgstr "Statistieken"
 
-#: 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 "Pak"
 
@@ -804,11 +829,11 @@ msgstr "Pak"
 msgid "Sun"
 msgstr "Zo"
 
-#: statistics.c:713
+#: statistics.c:722
 msgid "Surf Intv"
 msgstr "Oppervlaktetijd"
 
-#: print.c:488
+#: print.c:490
 msgid "Table print"
 msgstr "Tabellenafdruk"
 
@@ -820,7 +845,7 @@ msgstr "Fleswissel voorgesteld"
 msgid "Tank Pressure Info"
 msgstr "Info: Flesdruk"
 
-#: gtk-gui.c:615
+#: gtk-gui.c:617
 msgid "Temp"
 msgstr "Temperatuur"
 
@@ -828,11 +853,11 @@ msgstr "Temperatuur"
 msgid "Temperature"
 msgstr "Temperatuur"
 
-#: gtk-gui.c:599
+#: gtk-gui.c:601
 msgid "Temperature:"
 msgstr "Temperatuur:"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:924
 msgid "Three"
 msgstr "Drie"
 
@@ -840,11 +865,11 @@ msgstr "Drie"
 msgid "Thu"
 msgstr "Do"
 
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
 msgid "Time"
 msgstr "Tijd"
 
-#: gtk-gui.c:928
+#: gtk-gui.c:930
 msgid "Toggle Zoom"
 msgstr "Zoom in-/uitschakelen"
 
@@ -853,10 +878,18 @@ msgctxt "Duration"
 msgid "Total"
 msgstr "Totale"
 
-#: statistics.c:672
+#: statistics.c:681
 msgid "Total Time"
 msgstr "Totale tijd"
 
+#. ++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 "Di"
@@ -889,19 +922,19 @@ msgstr ""
 msgid "Uemis init failed"
 msgstr "Uemis niet geinitialiseerd"
 
-#: gtk-gui.c:577
+#: gtk-gui.c:579
 msgid "Units"
 msgstr "Eenheden"
 
-#: gtk-gui.c:901
+#: gtk-gui.c:903
 msgid "View"
 msgstr "Aanzicht"
 
-#: gtk-gui.c:594
+#: gtk-gui.c:596
 msgid "Volume:"
 msgstr "Volume:"
 
-#: statistics.c:721
+#: statistics.c:730
 msgid "Water Temp"
 msgstr "Watertemperatuur"
 
@@ -909,7 +942,7 @@ msgstr "Watertemperatuur"
 msgid "Wed"
 msgstr "Wo"
 
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
 msgid "Weight"
 msgstr "Gewicht"
 
@@ -917,7 +950,7 @@ msgstr "Gewicht"
 msgid "Weight System"
 msgstr "Gewichtssysteem"
 
-#: gtk-gui.c:604
+#: gtk-gui.c:606
 msgid "Weight:"
 msgstr "Gewicht:"
 
@@ -929,7 +962,7 @@ msgstr "XML bestand"
 msgid "Year"
 msgstr ""
 
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
 msgid "Yearly Statistics"
 msgstr "Jaarlijkse statistieken"
 
@@ -941,7 +974,7 @@ msgstr ""
 "U heeft onopgeslagen wijzigingen.\n"
 "Wilt u deze opslaan voordat u het databestand sluit?"
 
-#: 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 "riem"
 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 "Geintergreerd"
 
-#: 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 "US Pond"
 
-#: divelist.c:1261
+#: divelist.c:1264
 msgid "min"
 msgstr "min"
 
-#: statistics.c:493
+#: statistics.c:501
 #, c-format
 msgid "more than %d days"
 msgstr "Meer dan %d dagen"
@@ -995,7 +1028,7 @@ msgstr "Meer dan %d dagen"
 msgid "unkn"
 msgstr "Onbek"
 
-#: statistics.c:532
+#: statistics.c:541
 msgid "unknown"
 msgstr "Onbekend"