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, 219 insertions, 172 deletions

diff --git a/po/fi_FI.po b/po/fi_FI.po
index f8688d3fe..7541581fd 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,7 +1,7 @@
-# Finnish translations for 2.0.1 package
-# Finnish messages for 2.0.1.
-# Copyright (C) 2012 THE 2.0.1'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the 2.0.1 package.
+# Finnish translations for Subsurface package
+# Finnish messages for Subsurface.
+# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Subsurface package.
 # based on the Swedigh translations by
 # Linus Torvalds <torvalds@linux-foundation.org>, 2012.
 #
@@ -9,7 +9,7 @@ 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-13 13:26+0200\n"
 "Last-Translator: Tommi Saviranta <wnd@iki.fi>\n"
 "Language-Team: Finnish\n"
@@ -19,72 +19,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:160
-msgid ""
-"\n"
-"Average"
-msgstr ""
-"\n"
-"Keskim."
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Longest"
-msgstr ""
-"\n"
-"Pisin"
-
-#: statistics.c:162
-#: statistics.c:163
-msgid ""
-"\n"
-"Maximum"
-msgstr ""
-"\n"
-"Suurin"
-
-#: statistics.c:161
 #: statistics.c:162
-#: statistics.c:163
-msgid ""
-"\n"
-"Minimum"
+#, fuzzy
+msgctxt "Stats"
+msgid " > Month"
 msgstr ""
-"\n"
-"Pienin"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Shortest"
-msgstr ""
-"\n"
-"Lyhin"
+"Vuosi\n"
+" > Kuukausi"
 
 #: gtk-gui.c:1502
 msgid " Please select dive computer and device. "
 msgstr "Valitse sukellustietokone ja laitenimi."
 
-#: 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 "%d pv %d t %d min"
 
-#: statistics.c:486
+#: statistics.c:501
 #, c-format
 msgid "%dh %dmin"
 msgstr "%d t %d min"
@@ -126,20 +92,51 @@ msgstr "Automaattinen ryhmittely"
 msgid "Automatically group dives in trips"
 msgstr "Ryhmittele sukellukset retkiin automaattisesti"
 
-#: statistics.c:668
-#: statistics.c:705
+#: statistics.c:168
+#, fuzzy
+msgctxt "Depth"
+msgid "Average"
+msgstr ""
+"\n"
+"Keskim."
+
+#: statistics.c:165
+#, fuzzy
+msgctxt "Duration"
+msgid "Average"
+msgstr ""
+"\n"
+"Keskim."
+
+#: statistics.c:171
+#, fuzzy
+msgctxt "SAC"
+msgid "Average"
+msgstr ""
+"\n"
+"Keskim."
+
+#: statistics.c:174
+#, fuzzy
+msgctxt "Temp"
+msgid "Average"
+msgstr ""
+"\n"
+"Keskim."
+
+#: statistics.c:683 statistics.c:720
 msgid "Avg Depth"
 msgstr "Keskisyvyys"
 
-#: statistics.c:676
+#: statistics.c:691
 msgid "Avg SAC"
 msgstr "Pintakulutus"
 
-#: statistics.c:651
+#: statistics.c:666
 msgid "Avg Temp"
 msgstr "Keskilämpötila"
 
-#: statistics.c:658
+#: statistics.c:673
 msgid "Avg Time"
 msgstr "Keskipituus"
 
@@ -147,9 +144,7 @@ msgstr "Keskipituus"
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:484
-#: info.c:911
-#: print.c:155
+#: info.c:484 info.c:911 print.c:155
 msgid "Buddy"
 msgstr "Sukelluspari"
 
@@ -181,13 +176,11 @@ msgstr "Liitä uuteen retkeen"
 msgid "CuFt"
 msgstr "kuutiojalka"
 
-#: divelist.c:1265
-#: gtk-gui.c:620
+#: divelist.c:1265 gtk-gui.c:620
 msgid "Cyl"
 msgstr "Säiliöt"
 
-#: equipment.c:926
-#: equipment.c:1062
+#: equipment.c:926 equipment.c:1062
 msgid "Cylinder"
 msgstr "Säiliöt"
 
@@ -195,9 +188,7 @@ msgstr "Säiliöt"
 msgid "Cylinders"
 msgstr "Säiliöt"
 
-#: divelist.c:1258
-#: print.c:154
-#: statistics.c:696
+#: divelist.c:1258 print.c:154 statistics.c:711
 msgid "Date"
 msgstr "Ajankohta"
 
@@ -233,18 +224,10 @@ msgstr "Poista sukellus"
 msgid "Delete dives"
 msgstr "Poista sukellukset"
 
-#: print.c:154
+#: print.c:154 statistics.c:160
 msgid "Depth"
 msgstr "Syvyys"
 
-#: statistics.c:161
-msgid ""
-"Depth\n"
-"Average"
-msgstr ""
-"Syvyys\n"
-"Keskim."
-
 #: info.c:836
 #, c-format
 msgid "Depth (%s):"
@@ -277,9 +260,7 @@ msgstr "Sukellus #%d - %s"
 msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
 msgstr "Sukellus #%d - %s %02d-%02d-%04d, %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 "Tiedot"
 
@@ -287,7 +268,7 @@ msgstr "Tiedot"
 msgid "Dive Notes"
 msgstr "Muistiinpanot"
 
-#: statistics.c:697
+#: statistics.c:712
 msgid "Dive Time"
 msgstr "Sukellusaika"
 
@@ -323,22 +304,18 @@ msgstr "Sukelluslistan kirjasin"
 msgid "Divemaster"
 msgstr "Sukellusvanhin"
 
-#: statistics.c:648
+#: statistics.c:663
 msgid "Dives"
 msgstr "Sukelluskerrat"
 
-#: gtk-gui.c:911
-#: gtk-gui.c:1494
+#: gtk-gui.c:911 gtk-gui.c:1494
 msgid "Download From Dive Computer"
 msgstr "Hae sukellustietokoneelta"
 
 #: statistics.c:160
-msgid ""
-"Duration\n"
-"Total"
-msgstr ""
-"Kesto\n"
-"Yhteensä"
+#, fuzzy
+msgid "Duration"
+msgstr "Kesto (min)"
 
 #: info.c:831
 msgid "Duration (min)"
@@ -376,13 +353,11 @@ msgstr "Muuta retken tietoja"
 msgid "Enable / Disable Events"
 msgstr "Näytä / piilota tapahtumamerkit"
 
-#: equipment.c:965
-#: equipment.c:1489
+#: equipment.c:965 equipment.c:1489
 msgid "End"
 msgstr "Loppu"
 
-#: gtk-gui.c:1116
-#: info.c:504
+#: gtk-gui.c:1116 info.c:504
 msgid "Equipment"
 msgstr "Varusteet"
 
@@ -439,7 +414,7 @@ msgstr "Suodattimet"
 msgid "Fri"
 msgstr "pe"
 
-#: statistics.c:715
+#: statistics.c:730
 msgid "Gas Used"
 msgstr "Kulutus"
 
@@ -484,11 +459,7 @@ msgstr "Sukelluslista"
 msgid "Liter"
 msgstr "litra"
 
-#: divelist.c:1269
-#: info.c:458
-#: info.c:478
-#: info.c:905
-#: print.c:155
+#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
 msgid "Location"
 msgstr "Kohde"
 
@@ -496,7 +467,15 @@ msgstr "Kohde"
 msgid "Log"
 msgstr "Loki"
 
-#: statistics.c:659
+#: statistics.c:167
+#, fuzzy
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+"\n"
+"Pisin"
+
+#: statistics.c:674
 msgid "Longest Dive"
 msgstr "Pisin sukellus"
 
@@ -524,16 +503,15 @@ msgstr "Sukellusvanhin"
 msgid "Max Deco Time Warning"
 msgstr "Varoitus: etappipysähdysaika"
 
-#: statistics.c:666
-#: statistics.c:704
+#: statistics.c:681 statistics.c:719
 msgid "Max Depth"
 msgstr "Suurin syvyys"
 
-#: statistics.c:674
+#: statistics.c:689
 msgid "Max SAC"
 msgstr "Suurin pintakulutus"
 
-#: statistics.c:649
+#: statistics.c:664
 msgid "Max Temp"
 msgstr "Ylin lämpötila"
 
@@ -552,6 +530,30 @@ msgstr ""
 msgid "MaxPress"
 msgstr "Nimellispaine"
 
+#: statistics.c:170
+#, fuzzy
+msgctxt "Depth"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Suurin"
+
+#: statistics.c:173
+#, fuzzy
+msgctxt "SAC"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Suurin"
+
+#: statistics.c:176
+#, fuzzy
+msgctxt "Temp"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Suurin"
+
 #: main.c:46
 msgid "May"
 msgstr "touko"
@@ -568,18 +570,42 @@ msgstr "Liitä retki alla olevaan retkeen"
 msgid "Meter"
 msgstr "metri"
 
-#: statistics.c:667
+#: statistics.c:682
 msgid "Min Depth"
 msgstr "Pienin syvyys"
 
-#: statistics.c:675
+#: statistics.c:690
 msgid "Min SAC"
 msgstr "Pienin pintakulutus"
 
-#: statistics.c:650
+#: statistics.c:665
 msgid "Min Temp"
 msgstr "Alin lämpötila"
 
+#: statistics.c:169
+#, fuzzy
+msgctxt "Depth"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Pienin"
+
+#: statistics.c:172
+#, fuzzy
+msgctxt "SAC"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Pienin"
+
+#: statistics.c:175
+#, fuzzy
+msgctxt "Temp"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Pienin"
+
 #: gtk-gui.c:656
 msgid "Misc. Options"
 msgstr "Sekalaiset asetukset"
@@ -604,9 +630,7 @@ msgstr "Uusi aloitusnumero"
 msgid "No Tank Data"
 msgstr "Ei tietoja säiliöistä"
 
-#: info.c:463
-#: info.c:496
-#: info.c:919
+#: info.c:463 info.c:496 info.c:919
 msgid "Notes"
 msgstr "Muistiinpanot"
 
@@ -614,9 +638,7 @@ msgstr "Muistiinpanot"
 msgid "Nov"
 msgstr "marras"
 
-#: divelist.c:1268
-#: gtk-gui.c:635
-#: statistics.c:713
+#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
 msgid "OTU"
 msgstr "Happikertymä"
 
@@ -648,12 +670,11 @@ msgstr "Varoitus: hapen osapaine (green) TODO"
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:570
-#: gtk-gui.c:913
+#: gtk-gui.c:570 gtk-gui.c:913
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
 msgid "Pressure"
 msgstr "Paine"
 
@@ -697,8 +718,7 @@ msgstr "Huomautus: kaasumäärä"
 msgid "RGT Warning"
 msgstr "Varoitus: kaasumäärä"
 
-#: info.c:489
-#: info.c:916
+#: info.c:489 info.c:916
 msgid "Rating"
 msgstr "Yleisarvio"
 
@@ -719,8 +739,7 @@ msgstr "Erota sukellus pois retkestä"
 msgid "Remove selected dives from trip"
 msgstr "Erota valitut sukellukset pois retkestä"
 
-#: gtk-gui.c:802
-#: gtk-gui.c:914
+#: gtk-gui.c:802 gtk-gui.c:914
 msgid "Renumber"
 msgstr "Uudellennumeroi"
 
@@ -728,20 +747,10 @@ msgstr "Uudellennumeroi"
 msgid "Retry"
 msgstr "Yritä uudestaan"
 
-#: 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 "Pintakulutus"
 
-#: statistics.c:162
-msgid ""
-"SAC\n"
-"Average"
-msgstr ""
-"Pintakulutus\n"
-"Keskim."
-
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE-tiedosto"
@@ -770,8 +779,7 @@ msgstr "Tallenna muutokset?"
 msgid "Save File As"
 msgstr "Tallenna nimellä"
 
-#: gtk-gui.c:762
-#: gtk-gui.c:916
+#: gtk-gui.c:762 gtk-gui.c:916
 msgid "SelectEvents"
 msgstr "Valitse tapahtumat"
 
@@ -787,7 +795,15 @@ msgstr ""
 "Tiedoston req.txt kirjoittaminen epäonnistui\n"
 "Onko Uemis Zurich kytketty oikein?"
 
-#: statistics.c:660
+#: statistics.c:166
+#, fuzzy
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+"\n"
+"Lyhin"
+
+#: statistics.c:675
 msgid "Shortest Dive"
 msgstr "Lyhin sukellus"
 
@@ -795,7 +811,7 @@ msgstr "Lyhin sukellus"
 msgid "Show Columns"
 msgstr "Näytä sarakkeet"
 
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
 msgid "Size"
 msgstr "Tilavuus"
 
@@ -807,12 +823,11 @@ msgstr "Huomautus: nousunopeus"
 msgid "Speed Warning"
 msgstr "Varoitus: nousunopeus"
 
-#: equipment.c:962
-#: equipment.c:1488
+#: equipment.c:962 equipment.c:1488
 msgid "Start"
 msgstr "Alku"
 
-#: statistics.c:640
+#: statistics.c:655
 msgid "Statistics"
 msgstr "Tilastot"
 
@@ -820,10 +835,7 @@ msgstr "Tilastot"
 msgid "Stats"
 msgstr "Tilastot"
 
-#: divelist.c:1264
-#: gtk-gui.c:645
-#: info.c:490
-#: info.c:917
+#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
 msgid "Suit"
 msgstr "Puku"
 
@@ -832,7 +844,7 @@ msgstr "Puku"
 msgid "Sun"
 msgstr "su"
 
-#: statistics.c:698
+#: statistics.c:713
 msgid "Surf Intv"
 msgstr "Pinta-aika"
 
@@ -852,13 +864,10 @@ msgstr "Tiedotus: säiliöpaine"
 msgid "Temp"
 msgstr "Lämpötila"
 
-#: statistics.c:162
-msgid ""
-"Temperature\n"
-"Average"
-msgstr ""
-"Lämpötila\n"
-"Keskim."
+#: statistics.c:160
+#, fuzzy
+msgid "Temperature"
+msgstr "Lämpötila:"
 
 #: gtk-gui.c:599
 msgid "Temperature:"
@@ -872,8 +881,7 @@ msgstr "Kaikki"
 msgid "Thu"
 msgstr "to"
 
-#: info.c:791
-#: print.c:154
+#: info.c:791 print.c:154
 msgid "Time"
 msgstr "Kello"
 
@@ -881,7 +889,13 @@ msgstr "Kello"
 msgid "Toggle Zoom"
 msgstr "Venytä sukellusprofiilikuvaajaa"
 
-#: statistics.c:657
+#: statistics.c:164
+#, fuzzy
+msgctxt "Duration"
+msgid "Total"
+msgstr "Kokonaisaika"
+
+#: statistics.c:672
 msgid "Total Time"
 msgstr "Kokonaisaika"
 
@@ -889,8 +903,7 @@ msgstr "Kokonaisaika"
 msgid "Tue"
 msgstr "ti"
 
-#: equipment.c:1485
-#: equipment.c:1513
+#: equipment.c:1485 equipment.c:1513
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -930,7 +943,7 @@ msgstr "Näytä"
 msgid "Volume:"
 msgstr "Tilavuus:"
 
-#: statistics.c:706
+#: statistics.c:721
 msgid "Water Temp"
 msgstr "Veden lämpötila"
 
@@ -938,9 +951,7 @@ msgstr "Veden lämpötila"
 msgid "Wed"
 msgstr "ke"
 
-#: equipment.c:1012
-#: equipment.c:1609
-#: gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
 msgid "Weight"
 msgstr "Painot"
 
@@ -957,15 +968,10 @@ msgid "XML file"
 msgstr "XML-tiedosto"
 
 #: statistics.c:160
-msgid ""
-"Year\n"
-" > Month"
+msgid "Year"
 msgstr ""
-"Vuosi\n"
-" > Kuukausi"
 
-#: gtk-gui.c:915
-#: statistics.c:345
+#: gtk-gui.c:915 statistics.c:360
 msgid "Yearly Statistics"
 msgstr "Vuositilastot"
 
@@ -1014,8 +1020,7 @@ msgstr "integroitu"
 msgid "kg"
 msgstr "kg"
 
-#: divelist.c:1263
-#: gtk-gui.c:606
+#: divelist.c:1263 gtk-gui.c:606
 msgid "lbs"
 msgstr "pauna"
 
@@ -1023,17 +1028,16 @@ msgstr "pauna"
 msgid "min"
 msgstr "min"
 
-#: statistics.c:478
+#: statistics.c:493
 #, c-format
 msgid "more than %d days"
 msgstr "yli %d päivää"
 
-#: equipment.c:1378
-#: equipment.c:1398
+#: equipment.c:1378 equipment.c:1398
 msgid "unkn"
 msgstr "tuntematon"
 
-#: statistics.c:517
+#: statistics.c:532
 msgid "unknown"
 msgstr "tuntematon"
 
@@ -1045,3 +1049,46 @@ msgstr "määrittelemätön"
 msgid "weight"
 msgstr "Massa"
 
+#, fuzzy
+#~ msgctxt "Depth"
+#~ msgid ""
+#~ "Depth\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Syvyys\n"
+#~ "Keskim."
+
+#, fuzzy
+#~ msgctxt "Duration"
+#~ msgid ""
+#~ "Duration\n"
+#~ "Total"
+#~ msgstr ""
+#~ "Kesto\n"
+#~ "Yhteensä"
+
+#, fuzzy
+#~ msgctxt "SAC"
+#~ msgid ""
+#~ "SAC\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Pintakulutus\n"
+#~ "Keskim."
+
+#, fuzzy
+#~ msgid ""
+#~ "SAC|\n"
+#~ "Minimum"
+#~ msgstr ""
+#~ "\n"
+#~ "Pienin"
+
+#, fuzzy
+#~ msgctxt "Temp"
+#~ msgid ""
+#~ "Temperature\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Lämpötila\n"
+#~ "Keskim."