Improve translations

- fix two missing strings in equipment.c (thanks to Tommi Saviranta for
  pointing this out)

- add context for the translations of the Yearly/monthly statistics. The code
  for this ended up being incredibly ugly, but the gettext infrastructure
  really clashed with the way this is implemented. What I have now at least
  works (tested with the German translation)

- merge the new strings into all the po files. The non-German translations need
  to be updated. Make sure you remove the "# , fuzzy" lines or the current
  Makefile will ignore those additions.

- some minor cleanup of the po files (many listed the wrong language, all of
  them copied my incorrect use of PACKAGE (instead of saying "Subsurface").

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

1 files changed, 158 insertions, 112 deletions

diff --git a/po/de_DE.po b/po/de_DE.po
index af462fd92..02d648914 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,14 +1,14 @@
-# German translations for PACKAGE package
-# German messages for PACKAGE.
-# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# German translations for Subsurface package
+# German messages for Subsurface.
+# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Subsurface package.
 # Dirk Hohndel <dirk@hohndel.org>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-11 23:06+0900\n"
+"POT-Creation-Date: 2012-10-14 20:42-0700\n"
 "PO-Revision-Date: 2012-10-10 16:27+0900\n"
 "Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
 "Language-Team: German\n"
@@ -18,66 +18,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:160
-msgid ""
-"\n"
-"Average"
-msgstr ""
-"\n"
-"Ø"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Longest"
-msgstr ""
-"\n"
-"Max."
-
-#: statistics.c:162 statistics.c:163
-msgid ""
-"\n"
-"Maximum"
-msgstr ""
-"\n"
-"Max."
-
-#: statistics.c:161 statistics.c:162 statistics.c:163
-msgid ""
-"\n"
-"Minimum"
-msgstr ""
-"\n"
-"Min."
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Shortest"
-msgstr ""
-"\n"
-"Min."
+#: statistics.c:162
+msgctxt "Stats"
+msgid " > Month"
+msgstr " > Monat"
 
 #: gtk-gui.c:1502
 msgid " Please select dive computer and device. "
 msgstr " Bitte Tauchcomputer und Gerät auswählen. "
 
-#: statistics.c:601 statistics.c:603 statistics.c:605
+#: statistics.c:160
+msgid "#"
+msgstr ""
+
+#: statistics.c:616 statistics.c:618 statistics.c:620
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
-#: print.c:252 statistics.c:512
+#: print.c:252 statistics.c:527
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:484
+#: statistics.c:499
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dt %dst %dmin"
 
-#: statistics.c:486
+#: statistics.c:501
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dst %dmin"
@@ -119,19 +88,39 @@ msgstr "Automatisch gruppieren"
 msgid "Automatically group dives in trips"
 msgstr "Automatisch die Tauchgänge gruppieren"
 
-#: statistics.c:668 statistics.c:705
+#: statistics.c:168
+msgctxt "Depth"
+msgid "Average"
+msgstr "Ø"
+
+#: statistics.c:165
+msgctxt "Duration"
+msgid "Average"
+msgstr "Ø"
+
+#: statistics.c:171
+msgctxt "SAC"
+msgid "Average"
+msgstr "Ø"
+
+#: statistics.c:174
+msgctxt "Temp"
+msgid "Average"
+msgstr "Ø"
+
+#: statistics.c:683 statistics.c:720
 msgid "Avg Depth"
 msgstr "Durchschn. Tiefe"
 
-#: statistics.c:676
+#: statistics.c:691
 msgid "Avg SAC"
 msgstr "Ø AMV"
 
-#: statistics.c:651
+#: statistics.c:666
 msgid "Avg Temp"
 msgstr "Durchschn. Temp"
 
-#: statistics.c:658
+#: statistics.c:673
 msgid "Avg Time"
 msgstr "Duchschn. Dauer"
 
@@ -185,7 +174,7 @@ msgstr "Tank"
 msgid "Cylinders"
 msgstr "Tanks"
 
-#: divelist.c:1258 print.c:154 statistics.c:696
+#: divelist.c:1258 print.c:154 statistics.c:711
 msgid "Date"
 msgstr "Datum"
 
@@ -221,18 +210,10 @@ msgstr "Tauchgang löschen"
 msgid "Delete dives"
 msgstr "Tauchgänge löschen"
 
-#: print.c:154
+#: print.c:154 statistics.c:160
 msgid "Depth"
 msgstr "Tiefe"
 
-#: statistics.c:161
-msgid ""
-"Depth\n"
-"Average"
-msgstr ""
-"Tiefe\n"
-"Ø"
-
 #: info.c:836
 #, c-format
 msgid "Depth (%s):"
@@ -265,7 +246,7 @@ msgstr "Tauchgang #%d - %s"
 msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
 msgstr "Tauchgang #%d - %s %02d/%02d/%04d um %d:%02d"
 
-#: gtk-gui.c:1120 info.c:669 statistics.c:687
+#: gtk-gui.c:1120 info.c:669 statistics.c:702
 msgid "Dive Info"
 msgstr "Informationen"
 
@@ -273,7 +254,7 @@ msgstr "Informationen"
 msgid "Dive Notes"
 msgstr "Notizen"
 
-#: statistics.c:697
+#: statistics.c:712
 msgid "Dive Time"
 msgstr "Startzeit"
 
@@ -307,9 +288,9 @@ msgstr "Schriftart für Tauchliste"
 
 #: info.c:910
 msgid "Divemaster"
-msgstr "Divemaster"
+msgstr "Tauchgruppenführer"
 
-#: statistics.c:648
+#: statistics.c:663
 msgid "Dives"
 msgstr "Tauchgänge"
 
@@ -318,12 +299,8 @@ msgid "Download From Dive Computer"
 msgstr "Vom Tauchcomputer runterladen"
 
 #: statistics.c:160
-msgid ""
-"Duration\n"
-"Total"
-msgstr ""
-"Dauer\n"
-"Total"
+msgid "Duration"
+msgstr "Dauer"
 
 #: info.c:831
 msgid "Duration (min)"
@@ -422,7 +399,7 @@ msgstr "Filter"
 msgid "Fri"
 msgstr "Fr"
 
-#: statistics.c:715
+#: statistics.c:730
 msgid "Gas Used"
 msgstr "Gasverbrauch"
 
@@ -475,7 +452,12 @@ msgstr "Ort"
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:659
+#: statistics.c:167
+msgctxt "Duration"
+msgid "Longest"
+msgstr "Max."
+
+#: statistics.c:674
 msgid "Longest Dive"
 msgstr "Längster Tauchgang"
 
@@ -503,15 +485,15 @@ msgstr "Führer"
 msgid "Max Deco Time Warning"
 msgstr "Warnung: Maximale Deco Zeit"
 
-#: statistics.c:666 statistics.c:704
+#: statistics.c:681 statistics.c:719
 msgid "Max Depth"
 msgstr "Max. Tiefe"
 
-#: statistics.c:674
+#: statistics.c:689
 msgid "Max SAC"
 msgstr "Max. AMV"
 
-#: statistics.c:649
+#: statistics.c:664
 msgid "Max Temp"
 msgstr "Max. Temp."
 
@@ -530,6 +512,21 @@ msgstr ""
 msgid "MaxPress"
 msgstr "Max.Druck"
 
+#: statistics.c:170
+msgctxt "Depth"
+msgid "Maximum"
+msgstr "Max."
+
+#: statistics.c:173
+msgctxt "SAC"
+msgid "Maximum"
+msgstr "Max."
+
+#: statistics.c:176
+msgctxt "Temp"
+msgid "Maximum"
+msgstr "Max."
+
 #: main.c:46
 msgid "May"
 msgstr "Mai"
@@ -546,18 +543,33 @@ msgstr "Gruppe mit der darunter verbinden"
 msgid "Meter"
 msgstr "Meter"
 
-#: statistics.c:667
+#: statistics.c:682
 msgid "Min Depth"
 msgstr "Min. Tiefe"
 
-#: statistics.c:675
+#: statistics.c:690
 msgid "Min SAC"
 msgstr "Min. AMV"
 
-#: statistics.c:650
+#: statistics.c:665
 msgid "Min Temp"
 msgstr "Min. Temp."
 
+#: statistics.c:169
+msgctxt "Depth"
+msgid "Minimum"
+msgstr "Min."
+
+#: statistics.c:172
+msgctxt "SAC"
+msgid "Minimum"
+msgstr "Min."
+
+#: statistics.c:175
+msgctxt "Temp"
+msgid "Minimum"
+msgstr "Min."
+
 #: gtk-gui.c:656
 msgid "Misc. Options"
 msgstr "Verschiedene Optionen"
@@ -590,7 +602,7 @@ msgstr "Notizen"
 msgid "Nov"
 msgstr "Nov"
 
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:713
+#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
 msgid "OTU"
 msgstr "OTU"
 
@@ -626,7 +638,7 @@ msgstr "psi"
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
 msgid "Pressure"
 msgstr "Druck"
 
@@ -699,18 +711,10 @@ msgstr "Neu nummerieren"
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:712
+#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
 msgid "SAC"
 msgstr "AMV"
 
-#: statistics.c:162
-msgid ""
-"SAC\n"
-"Average"
-msgstr ""
-"AMV\n"
-"Ø"
-
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE Datei"
@@ -755,7 +759,12 @@ msgstr ""
 "Unvollständiger Schreibvorgang der req.txt Datei\n"
 "Ist der Uemis Zurich korrekt verbunden?"
 
-#: statistics.c:660
+#: statistics.c:166
+msgctxt "Duration"
+msgid "Shortest"
+msgstr "Min."
+
+#: statistics.c:675
 msgid "Shortest Dive"
 msgstr "Kürzester Tauchgang"
 
@@ -763,7 +772,7 @@ msgstr "Kürzester Tauchgang"
 msgid "Show Columns"
 msgstr "Spalten anzeigen"
 
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
 msgid "Size"
 msgstr "Größe"
 
@@ -779,7 +788,7 @@ msgstr "Warnung: Geschwindigkeit"
 msgid "Start"
 msgstr "Start"
 
-#: statistics.c:640
+#: statistics.c:655
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -796,7 +805,7 @@ msgstr "Anzug"
 msgid "Sun"
 msgstr "So"
 
-#: statistics.c:698
+#: statistics.c:713
 msgid "Surf Intv"
 msgstr "Oberflächenpause"
 
@@ -816,13 +825,9 @@ msgstr "Info: Tankdruck"
 msgid "Temp"
 msgstr "Temperatur"
 
-#: statistics.c:162
-msgid ""
-"Temperature\n"
-"Average"
-msgstr ""
-"Temperatur\n"
-"Ø"
+#: statistics.c:160
+msgid "Temperature"
+msgstr "Temperatur"
 
 #: gtk-gui.c:599
 msgid "Temperature:"
@@ -844,7 +849,12 @@ msgstr "Zeit"
 msgid "Toggle Zoom"
 msgstr "Zoom ein-/ausschalten"
 
-#: statistics.c:657
+#: statistics.c:164
+msgctxt "Duration"
+msgid "Total"
+msgstr "Gesamt"
+
+#: statistics.c:672
 msgid "Total Time"
 msgstr "Gesamtzeit"
 
@@ -892,7 +902,7 @@ msgstr "Ansicht"
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: statistics.c:706
+#: statistics.c:721
 msgid "Water Temp"
 msgstr "Wassertemperatur"
 
@@ -917,14 +927,10 @@ msgid "XML file"
 msgstr "XML Datei"
 
 #: statistics.c:160
-msgid ""
-"Year\n"
-" > Month"
+msgid "Year"
 msgstr ""
-"Jahr\n"
-" > Monat"
 
-#: gtk-gui.c:915 statistics.c:345
+#: gtk-gui.c:915 statistics.c:360
 msgid "Yearly Statistics"
 msgstr "Jährliche Statistiken"
 
@@ -981,7 +987,7 @@ msgstr "US Pfund"
 msgid "min"
 msgstr "min"
 
-#: statistics.c:478
+#: statistics.c:493
 #, c-format
 msgid "more than %d days"
 msgstr "mehr als %d Tage"
@@ -990,7 +996,7 @@ msgstr "mehr als %d Tage"
 msgid "unkn"
 msgstr "unbk"
 
-#: statistics.c:517
+#: statistics.c:532
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -1001,3 +1007,43 @@ msgstr "nicht angegeben"
 #: equipment.c:1514
 msgid "weight"
 msgstr "Gewicht"
+
+#~ msgctxt "Depth"
+#~ msgid ""
+#~ "Depth\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Tiefe\n"
+#~ "Ø"
+
+#~ msgctxt "Duration"
+#~ msgid ""
+#~ "Duration\n"
+#~ "Total"
+#~ msgstr ""
+#~ "Dauer\n"
+#~ "Gesamt"
+
+#~ msgctxt "SAC"
+#~ msgid ""
+#~ "SAC\n"
+#~ "Average"
+#~ msgstr ""
+#~ "AMV\n"
+#~ "Ø"
+
+#, fuzzy
+#~ msgid ""
+#~ "SAC|\n"
+#~ "Minimum"
+#~ msgstr ""
+#~ "\n"
+#~ "Min."
+
+#~ msgctxt "Temp"
+#~ msgid ""
+#~ "Temperature\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Temperatur\n"
+#~ "Ø"