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, 193 insertions, 150 deletions

diff --git a/po/es_ES.po b/po/es_ES.po
index 6db28aa23..c394e1d82 100644
--- a/po/es_ES.po
+++ b/po/es_ES.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-16 12:05+0100\n"
 "Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
 "Language-Team: Spanish\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
 msgid " > Month"
 msgstr "> Mes"
 
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
 msgid " Please select dive computer and device. "
 msgstr " Por favor, seleccione el ordenador de buceo y el dispositivo."
 
@@ -32,22 +32,46 @@ msgstr " Por favor, seleccione el ordenador de buceo y el dispositivo."
 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 "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
+
+#: print.c:254 statistics.c:536
 #, c-format
 msgid "%d min"
 msgstr "%d minutos"
 
-#: statistics.c:499
+#: statistics.c:507
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd, %dh %dmin"
 
-#: statistics.c:501
+#: statistics.c:509
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
@@ -57,19 +81,19 @@ msgstr "%dh %dmin"
 msgid "(%s) or (%s)"
 msgstr "(%s) o (%s)"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:920
 msgid "About"
 msgstr "Acerca de"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:914
 msgid "Add Dive"
 msgstr "Añadir buceo"
 
-#: divelist.c:2019
+#: divelist.c:2022
 msgid "Add dive"
 msgstr "Añadir buceo"
 
-#: divelist.c:2098
+#: divelist.c:2101
 msgid "Add to trip above"
 msgstr "Añadir al viaje anterior"
 
@@ -81,11 +105,11 @@ msgstr "abril"
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:929
 msgid "Autogroup"
 msgstr "Auto Group"
 
-#: gtk-gui.c:662
+#: gtk-gui.c:664
 msgid "Automatically group dives in trips"
 msgstr "se sumerge automáticamente en grupos de viajes"
 
@@ -109,55 +133,59 @@ msgctxt "Temp"
 msgid "Average"
 msgstr "Promedio"
 
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
 msgid "Avg Depth"
 msgstr "Promedio de Profundidad"
 
-#: statistics.c:691
+#: statistics.c:700
 msgid "Avg SAC"
 msgstr "Promedio SAC"
 
-#: statistics.c:666
+#: statistics.c:675
 msgid "Avg Temp"
 msgstr "Promedio Temp"
 
-#: statistics.c:673
+#: statistics.c:682
 msgid "Avg Time"
 msgstr "medio tiempo"
 
-#: gtk-gui.c:590
+#: gtk-gui.c:592
 msgid "Bar"
 msgstr "Bar"
 
-#: info.c:484 info.c:911 print.c:155 gtk-gui.c:600
+#: info.c:488 info.c:915 print.c:156
+msgid "Buddy"
+msgstr ""
+
+#: gtk-gui.c:602
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:520
+#: gtk-gui.c:522
 msgid "Choose Default XML File"
 msgstr "Seleccionar archivo XML predeterminado"
 
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Elegir archivos XML para importar en archivo de datos actual"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:910
 msgid "Close"
 msgstr "Cerrar"
 
-#: divelist.c:2115
+#: divelist.c:2118
 msgid "Collapse all"
 msgstr "Contraer todo"
 
-#: divelist.c:2088
+#: divelist.c:2091
 msgid "Create new trip above"
 msgstr "Crear nuevo viaje por encima"
 
-#: 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 "Cil"
 
@@ -169,15 +197,15 @@ msgstr "Cilindro"
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
 msgid "Date"
 msgstr "Fecha"
 
-#: info.c:776
+#: info.c:780
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: info.c:786
+#: info.c:790
 msgid "Date:"
 msgstr "Fecha"
 
@@ -185,31 +213,31 @@ msgstr "Fecha"
 msgid "Dec"
 msgstr "Dec"
 
-#: gtk-gui.c:667
+#: gtk-gui.c:669
 msgid "Default XML Data File"
 msgstr "Default XML archivo"
 
-#: info.c:227
+#: info.c:229
 msgid "Delete"
 msgstr "Eliminar"
 
-#: info.c:178
+#: info.c:180
 msgid "Delete Dive"
 msgstr "Dive Delete"
 
-#: divelist.c:2006
+#: divelist.c:2009
 msgid "Delete dive"
 msgstr "dive Delete"
 
-#: divelist.c:2005
+#: divelist.c:2008
 msgid "Delete dives"
 msgstr "Eliminar inmersiones"
 
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
 msgid "Depth"
 msgstr "Profundidad"
 
-#: info.c:836
+#: info.c:840
 #, c-format
 msgid "Depth (%s):"
 msgstr "Profundidad (%s):"
@@ -218,38 +246,39 @@ msgstr "Profundidad (%s):"
 msgid "Depth Limit Exceeded"
 msgstr "Superado límite de profundidad"
 
-#: gtk-gui.c:584
+#: gtk-gui.c:586
 msgid "Depth:"
 msgstr "Profundidad"
 
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
 msgid "Device name"
 msgstr "Nombre del dispositivo"
 
+#. ++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 "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
+
 #: print.c:67
 #, c-format
 msgid "Dive #%d - "
 msgstr "Dive #%d -"
 
-#: info.c:144
+#: info.c:146
 #, c-format
 msgid "Dive #%d - %s"
 msgstr "Dive #%d - %s"
 
-#: info.c:106
-#, c-format
-msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
-msgstr "Dive #%d - %s %02d/%02d/%04d at %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 "Dive info"
 
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
 msgid "Dive Notes"
 msgstr "Notas de buceo"
 
-#: statistics.c:712
+#: statistics.c:721
 msgid "Dive Time"
 msgstr "Dive Time"
 
@@ -261,35 +290,35 @@ msgstr "Dive Alert Time"
 msgid "Dive Time Info"
 msgstr "Dive Time Info"
 
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
 msgid "Dive computer"
 msgstr "Dive Computer"
 
-#: print.c:474
+#: print.c:476
 msgid "Dive details"
 msgstr "Dive detalle"
 
-#: info.c:483
+#: info.c:487
 msgid "Dive master"
 msgstr "Dive Master"
 
-#: print.c:154
+#: print.c:155
 msgid "Dive#"
 msgstr "Dive #"
 
-#: gtk-gui.c:650
+#: gtk-gui.c:652
 msgid "Divelist Font"
 msgstr "Divelist fuente"
 
-#: info.c:910
+#: info.c:914
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:663
+#: statistics.c:672
 msgid "Dives"
 msgstr "Inmersiones"
 
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
 msgid "Download From Dive Computer"
 msgstr "Descargar desde el ordenador de buceo"
 
@@ -297,39 +326,39 @@ msgstr "Descargar desde el ordenador de buceo"
 msgid "Duration"
 msgstr "Duración"
 
-#: info.c:831
+#: info.c:835
 msgid "Duration (min)"
 msgstr "Duración (min)"
 
-#: info.c:228
+#: info.c:230
 msgid "Edit"
 msgstr "Editar"
 
-#: info.c:628
+#: info.c:632
 msgid "Edit Trip Info"
 msgstr "Editar el viaje"
 
-#: divelist.c:2027
+#: divelist.c:2030
 msgid "Edit Trip Summary"
 msgstr "Editar Resumen del Viaje"
 
-#: divelist.c:2003
+#: divelist.c:2006
 msgid "Edit dive"
 msgstr "Editar buceo"
 
-#: divelist.c:2002
+#: divelist.c:2005
 msgid "Edit dives"
 msgstr "Editar inmersiones"
 
-#: info.c:471
+#: info.c:475
 msgid "Edit multiple dives"
 msgstr "Editar inmersiones"
 
-#: info.c:453
+#: info.c:455
 msgid "Edit trip summary"
 msgstr "Edit viaje sumario"
 
-#: gtk-gui.c:771
+#: gtk-gui.c:773
 msgid "Enable / Disable Events"
 msgstr "Activar / Desactivar Eventos"
 
@@ -337,15 +366,15 @@ msgstr "Activar / Desactivar Eventos"
 msgid "End"
 msgstr "Fin"
 
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
 msgid "Equipment"
 msgstr "Equipo"
 
-#: divelist.c:2112
+#: divelist.c:2115
 msgid "Expand all"
 msgstr "Expandir todos"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:603
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
@@ -354,12 +383,12 @@ msgstr "Fahrenheit"
 msgid "Failed to open %i files."
 msgstr "No se pudo abrir %i archivos."
 
-#: parse-xml.c:1471
+#: parse-xml.c:1498
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "No se pudo '%s' parse"
 
-#: parse-xml.c:1466
+#: parse-xml.c:1493
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "No puede analizar '%s'.\n"
@@ -378,15 +407,15 @@ msgstr "No se pudo leer '%s'.\n"
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:588
 msgid "Feet"
 msgstr "Pies"
 
-#: gtk-gui.c:899
+#: gtk-gui.c:901
 msgid "File"
 msgstr "Archivo"
 
-#: gtk-gui.c:902
+#: gtk-gui.c:904
 msgid "Filter"
 msgstr "filtros"
 
@@ -394,7 +423,7 @@ msgstr "filtros"
 msgid "Fri"
 msgstr "Sun"
 
-#: statistics.c:730
+#: statistics.c:739
 msgid "Gas Used"
 msgstr "El gas usado"
 
@@ -402,15 +431,15 @@ msgstr "El gas usado"
 msgid "Gasmix"
 msgstr "gas mezcla"
 
-#: gtk-gui.c:903
+#: gtk-gui.c:905
 msgid "Help"
 msgstr "Ayuda"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:912
 msgid "Import XML File(s)"
 msgstr "Importar XML File(s)"
 
-#: gtk-gui.c:921
+#: gtk-gui.c:923
 msgid "Info"
 msgstr "info"
 
@@ -427,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 y otros, 2011, 2012"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:921
 msgid "List"
 msgstr "Lista"
 
-#: gtk-gui.c:595
+#: gtk-gui.c:597
 msgid "Liter"
 msgstr "litro"
 
-#: 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 "Ubicación"
 
-#: gtk-gui.c:900
+#: gtk-gui.c:902
 msgid "Log"
 msgstr "Log"
 
@@ -452,7 +481,7 @@ msgctxt "Duration"
 msgid "Longest"
 msgstr "Mayor"
 
-#: statistics.c:674
+#: statistics.c:683
 msgid "Longest Dive"
 msgstr "Longest buceo"
 
@@ -472,7 +501,7 @@ msgstr "Mar"
 msgid "Marker"
 msgstr "marcador"
 
-#: print.c:154
+#: print.c:155
 msgid "Master"
 msgstr "maestro"
 
@@ -480,23 +509,24 @@ msgstr "maestro"
 msgid "Max Deco Time Warning"
 msgstr "Max Deco Advertencia Tiempo"
 
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
 msgid "Max Depth"
 msgstr "Profundidad Max"
 
-#: statistics.c:689
+#: statistics.c:698
 msgid "Max SAC"
 msgstr "Max SAC"
 
-#: statistics.c:664
+#: statistics.c:673
 msgid "Max Temp"
 msgstr "Max. Temp."
 
-#: print.c:94
-#, c-format
+#: print.c:95
+#, fuzzy, c-format
 msgid ""
-"%sMax depth: %.*f %s\n"
+"Max depth: %.*f %s\n"
 "Duration: %d min\n"
+"%s"
 msgstr ""
 "%sProfundidad Máxima:.%.*f %s\n"
 "Duración :%d minutos\n"
@@ -524,27 +554,27 @@ msgstr "Máximo"
 msgid "May"
 msgstr "Mayo"
 
-#: divelist.c:2035
+#: divelist.c:2038
 msgid "Merge trip with trip above"
 msgstr "Combinar viaje con el viaje de encima"
 
-#: divelist.c:2045
+#: divelist.c:2048
 msgid "Merge trip with trip below"
 msgstr "Combinar viaje con el viaje de abajo"
 
-#: gtk-gui.c:585
+#: gtk-gui.c:587
 msgid "Meter"
 msgstr "metros"
 
-#: statistics.c:682
+#: statistics.c:691
 msgid "Min Depth"
 msgstr "Intensidad mínima"
 
-#: statistics.c:690
+#: statistics.c:699
 msgid "Min SAC"
 msgstr "Min SAC"
 
-#: statistics.c:665
+#: statistics.c:674
 msgid "Min Temp"
 msgstr "Min Temp"
 
@@ -563,7 +593,7 @@ msgctxt "Temp"
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: gtk-gui.c:656
+#: gtk-gui.c:658
 msgid "Misc. Options"
 msgstr "Opciones Misc."
 
@@ -571,15 +601,15 @@ msgstr "Opciones Misc."
 msgid "Mon"
 msgstr "Mon"
 
-#: gtk-gui.c:851
+#: gtk-gui.c:853
 msgid "Multi-platform divelog software in C"
 msgstr "Multi-plataforma de software en C DiveLog"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:906
 msgid "New"
 msgstr "Nuevo"
 
-#: gtk-gui.c:811
+#: gtk-gui.c:813
 msgid "New starting number"
 msgstr "Nuevo número de partida"
 
@@ -587,7 +617,7 @@ msgstr "Nuevo número de partida"
 msgid "No Tank Data"
 msgstr "Los datos de los tanques"
 
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
 msgid "Notes"
 msgstr "Notas"
 
@@ -595,7 +625,7 @@ msgstr "Notas"
 msgid "Nov"
 msgstr "noviembre"
 
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
 msgid "OTU"
 msgstr "UTO"
 
@@ -603,11 +633,11 @@ msgstr "UTO"
 msgid "Oct"
 msgstr "Oct"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:907
 msgid "Open"
 msgstr "Abrir"
 
-#: gtk-gui.c:313
+#: gtk-gui.c:315
 msgid "Open File"
 msgstr "Abrir archivo"
 
@@ -623,11 +653,11 @@ msgstr "Ascender PO2 Warning"
 msgid "PO2 Green Warning"
 msgstr "Green Advertencia 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 "Preferencias"
 
@@ -635,35 +665,35 @@ msgstr "Preferencias"
 msgid "Pressure"
 msgstr "Presión"
 
-#: gtk-gui.c:589
+#: gtk-gui.c:591
 msgid "Pressure:"
 msgstr "Presión"
 
-#: print.c:484
+#: print.c:486
 msgid "Pretty print"
 msgstr "Pretty Print"
 
-#: gtk-gui.c:909
+#: gtk-gui.c:911
 msgid "Print"
 msgstr "Imprimir"
 
-#: print.c:505
+#: print.c:507
 msgid "Print only selected dives"
 msgstr "Imprimir sólo inmersiones seleccionadas"
 
-#: print.c:500
+#: print.c:502
 msgid "Print selection"
 msgstr "Imprimir selección"
 
-#: print.c:478
+#: print.c:480
 msgid "Print type"
 msgstr "Imprimir escriba"
 
-#: gtk-gui.c:920
+#: gtk-gui.c:922
 msgid "Profile"
 msgstr "Perfiles"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:919
 msgid "Quit"
 msgstr "Salir"
 
@@ -675,7 +705,7 @@ msgstr "RGT Alert"
 msgid "RGT Warning"
 msgstr "RGT Warning"
 
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
 msgid "Rating"
 msgstr "Rating"
 
@@ -684,27 +714,27 @@ msgstr "Rating"
 msgid "Reading dive %s"
 msgstr "Leyendo%s dive"
 
-#: divelist.c:2050
+#: divelist.c:2053
 msgid "Remove Trip"
 msgstr "Eliminar Trip"
 
-#: divelist.c:2106
+#: divelist.c:2109
 msgid "Remove dive from trip"
 msgstr "Eliminar de viaje de buceo"
 
-#: divelist.c:2104
+#: divelist.c:2107
 msgid "Remove selected dives from trip"
 msgstr "Quitar saltos seleccionados de viaje"
 
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
 msgid "Renumber"
 msgstr "Renumerar"
 
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
 msgid "Retry"
 msgstr "Intentar de nuevo"
 
-#: 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"
 
@@ -720,11 +750,11 @@ msgstr "Seguridad Violación Stop"
 msgid "Sat"
 msgstr "satélite"
 
-#: gtk-gui.c:906
+#: gtk-gui.c:908
 msgid "Save"
 msgstr "Guardar"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:909
 msgid "Save As"
 msgstr "Guardar como"
 
@@ -736,7 +766,7 @@ msgstr "Guardar cambios?"
 msgid "Save File As"
 msgstr "Guardar archivo como"
 
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
 msgid "SelectEvents"
 msgstr "Seleccionar eventos"
 
@@ -757,11 +787,11 @@ msgctxt "Duration"
 msgid "Shortest"
 msgstr "Menor"
 
-#: statistics.c:675
+#: statistics.c:684
 msgid "Shortest Dive"
 msgstr "Menor de buceo"
 
-#: gtk-gui.c:609
+#: gtk-gui.c:611
 msgid "Show Columns"
 msgstr "Mostrar columnas"
 
@@ -781,15 +811,15 @@ msgstr "Advertencia de velocidad"
 msgid "Start"
 msgstr "Inicio"
 
-#: statistics.c:655
+#: statistics.c:664
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
 msgid "Stats"
 msgstr "Estadísticas"
 
-#: 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 "Suit"
 
@@ -798,11 +828,11 @@ msgstr "Suit"
 msgid "Sun"
 msgstr "Sun"
 
-#: statistics.c:713
+#: statistics.c:722
 msgid "Surf Intv"
 msgstr "Surf Intv"
 
-#: print.c:488
+#: print.c:490
 msgid "Table print"
 msgstr "Tabla de impresión"
 
@@ -814,7 +844,7 @@ msgstr "El cambio sugerido Tank"
 msgid "Tank Pressure Info"
 msgstr "Tank info presión"
 
-#: gtk-gui.c:615
+#: gtk-gui.c:617
 msgid "Temp"
 msgstr "Temp"
 
@@ -822,11 +852,11 @@ msgstr "Temp"
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: gtk-gui.c:599
+#: gtk-gui.c:601
 msgid "Temperature:"
 msgstr "Temperatura"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:924
 msgid "Three"
 msgstr "Three"
 
@@ -834,11 +864,11 @@ msgstr "Three"
 msgid "Thu"
 msgstr "Jue"
 
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
 msgid "Time"
 msgstr "Tiempo"
 
-#: gtk-gui.c:928
+#: gtk-gui.c:930
 msgid "Toggle Zoom"
 msgstr "Zoom Toggle"
 
@@ -847,11 +877,24 @@ msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:672
+#: statistics.c:681
 msgid "Total Time"
 msgstr "Tiempo total"
 
-#: main.c:37 equipment.c:1485 equipment.c:1513
+#. ++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
+#, fuzzy
+msgid "Tue"
+msgstr "Jue"
+
+#: equipment.c:1485 equipment.c:1513
 msgid "Type"
 msgstr "Tipo"
 
@@ -879,19 +922,19 @@ msgstr ""
 msgid "Uemis init failed"
 msgstr "uemis init failed"
 
-#: gtk-gui.c:577
+#: gtk-gui.c:579
 msgid "Units"
 msgstr "Unidades"
 
-#: gtk-gui.c:901
+#: gtk-gui.c:903
 msgid "View"
 msgstr "Ver"
 
-#: gtk-gui.c:594
+#: gtk-gui.c:596
 msgid "Volume:"
 msgstr "Volumen"
 
-#: statistics.c:721
+#: statistics.c:730
 msgid "Water Temp"
 msgstr "Water Temp"
 
@@ -899,7 +942,7 @@ msgstr "Water Temp"
 msgid "Wed"
 msgstr "Wed"
 
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
 msgid "Weight"
 msgstr "Peso"
 
@@ -907,7 +950,7 @@ msgstr "Peso"
 msgid "Weight System"
 msgstr "Peso del sistema"
 
-#: gtk-gui.c:604
+#: gtk-gui.c:606
 msgid "Weight:"
 msgstr "Peso"
 
@@ -919,7 +962,7 @@ msgstr "XML archivo"
 msgid "Year"
 msgstr "Año"
 
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
 msgid "Yearly Statistics"
 msgstr "Estadísticas anuales"
 
@@ -931,7 +974,7 @@ msgstr ""
 "Has guardado los cambios \n"
 "¿Te gustaría salvar a aquellos antes de cerrar el archivo de datos?"
 
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -956,7 +999,7 @@ msgstr "cinturón"
 msgid "clip-on"
 msgstr "clip-on"
 
-#: divelist.c:1260
+#: divelist.c:1263
 msgid "ft"
 msgstr "ft"
 
@@ -964,19 +1007,19 @@ msgstr "ft"
 msgid "integrated"
 msgstr "integrado"
 
-#: 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 "libra"
 
-#: divelist.c:1261
+#: divelist.c:1264
 msgid "min"
 msgstr "min"
 
-#: statistics.c:493
+#: statistics.c:501
 #, c-format
 msgid "more than %d days"
 msgstr "más de %d días"
@@ -985,7 +1028,7 @@ msgstr "más de %d días"
 msgid "unkn"
 msgstr "UNKN"
 
-#: statistics.c:532
+#: statistics.c:541
 msgid "unknown"
 msgstr "desconocido"