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, 221 insertions, 173 deletions

diff --git a/po/sk_SK.po b/po/sk_SK.po
index c879ec82c..0657a3737 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,89 +1,56 @@
-# 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.
+# Slovakian translations for Subsurface package
+# Slovakian 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.
+# Jozef Ivanecký <dodo.sk@gmail.com>, 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-12 15:03+0100\n"
 "Last-Translator: Jozef Ivanecký <dodo.sk@gmail.com>\n"
-"Language-Team: German\n"
+"Language-Team: Slovakian\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:160
-msgid ""
-"\n"
-"Average"
-msgstr ""
-"\n"
-"Priemer"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Longest"
-msgstr ""
-"\n"
-"Najdlhší"
-
-#: statistics.c:162
-#: statistics.c:163
-msgid ""
-"\n"
-"Maximum"
-msgstr ""
-"\n"
-"Maximum"
-
-#: statistics.c:161
 #: statistics.c:162
-#: statistics.c:163
-msgid ""
-"\n"
-"Minimum"
-msgstr ""
-"\n"
-"Minimum"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Shortest"
+#, fuzzy
+msgctxt "Stats"
+msgid " > Month"
 msgstr ""
-"\n"
-"Najkratší"
+"Rok\n"
+" > Mesiac"
 
 #: gtk-gui.c:1502
 msgid " Please select dive computer and device. "
 msgstr "Voľba typu počítača a zariadia. "
 
-#: 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 "%dd %dh %dmin"
 
-#: statistics.c:486
+#: statistics.c:501
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
@@ -125,20 +92,51 @@ msgstr "Automatické zgrupovanie"
 msgid "Automatically group dives in trips"
 msgstr "Automatické zrgupovanie do akcii"
 
-#: statistics.c:668
-#: statistics.c:705
+#: statistics.c:168
+#, fuzzy
+msgctxt "Depth"
+msgid "Average"
+msgstr ""
+"\n"
+"Priemer"
+
+#: statistics.c:165
+#, fuzzy
+msgctxt "Duration"
+msgid "Average"
+msgstr ""
+"\n"
+"Priemer"
+
+#: statistics.c:171
+#, fuzzy
+msgctxt "SAC"
+msgid "Average"
+msgstr ""
+"\n"
+"Priemer"
+
+#: statistics.c:174
+#, fuzzy
+msgctxt "Temp"
+msgid "Average"
+msgstr ""
+"\n"
+"Priemer"
+
+#: statistics.c:683 statistics.c:720
 msgid "Avg Depth"
 msgstr "Priemerná hĺbka"
 
-#: statistics.c:676
+#: statistics.c:691
 msgid "Avg SAC"
 msgstr "Priemerná spotreba"
 
-#: statistics.c:651
+#: statistics.c:666
 msgid "Avg Temp"
 msgstr "Priemerná teplota"
 
-#: statistics.c:658
+#: statistics.c:673
 msgid "Avg Time"
 msgstr "Priemerný čas"
 
@@ -146,9 +144,7 @@ msgstr "Priemerný čas"
 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 "Partner"
 
@@ -180,13 +176,11 @@ msgstr "Vytvoriť novú akciu nad"
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1265
-#: gtk-gui.c:620
+#: divelist.c:1265 gtk-gui.c:620
 msgid "Cyl"
 msgstr "Fľaša"
 
-#: equipment.c:926
-#: equipment.c:1062
+#: equipment.c:926 equipment.c:1062
 msgid "Cylinder"
 msgstr "Fľaša"
 
@@ -194,9 +188,7 @@ msgstr "Fľaša"
 msgid "Cylinders"
 msgstr "Fľaše"
 
-#: divelist.c:1258
-#: print.c:154
-#: statistics.c:696
+#: divelist.c:1258 print.c:154 statistics.c:711
 msgid "Date"
 msgstr "Dátum"
 
@@ -232,18 +224,10 @@ msgstr "Zmazať ponor"
 msgid "Delete dives"
 msgstr "Zmazať ponory"
 
-#: print.c:154
+#: print.c:154 statistics.c:160
 msgid "Depth"
 msgstr "Hĺbka"
 
-#: statistics.c:161
-msgid ""
-"Depth\n"
-"Average"
-msgstr ""
-"Priemerná\n"
-"Hĺbka"
-
 #: info.c:836
 #, c-format
 msgid "Depth (%s):"
@@ -276,9 +260,7 @@ msgstr "Ponor #%d - %s"
 msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
 msgstr "Ponor #%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 "Informácie"
 
@@ -286,7 +268,7 @@ msgstr "Informácie"
 msgid "Dive Notes"
 msgstr "Poznámky"
 
-#: statistics.c:697
+#: statistics.c:712
 msgid "Dive Time"
 msgstr "Čas Ponoru"
 
@@ -322,22 +304,18 @@ msgstr "Font pre ponory"
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:648
+#: statistics.c:663
 msgid "Dives"
 msgstr "Ponory"
 
-#: gtk-gui.c:911
-#: gtk-gui.c:1494
+#: gtk-gui.c:911 gtk-gui.c:1494
 msgid "Download From Dive Computer"
 msgstr "Nahratie údajov z počítača"
 
 #: statistics.c:160
-msgid ""
-"Duration\n"
-"Total"
-msgstr ""
-"Dĺžka\n"
-"Celková"
+#, fuzzy
+msgid "Duration"
+msgstr "Dĺžka (min)"
 
 #: info.c:831
 msgid "Duration (min)"
@@ -375,13 +353,11 @@ msgstr "Editovať sumár"
 msgid "Enable / Disable Events"
 msgstr "Povolit / zakázať udalosti"
 
-#: equipment.c:965
-#: equipment.c:1489
+#: equipment.c:965 equipment.c:1489
 msgid "End"
 msgstr "Koniec"
 
-#: gtk-gui.c:1116
-#: info.c:504
+#: gtk-gui.c:1116 info.c:504
 msgid "Equipment"
 msgstr "Výstroj"
 
@@ -438,7 +414,7 @@ msgstr "Filter"
 msgid "Fri"
 msgstr "Pi"
 
-#: statistics.c:715
+#: statistics.c:730
 msgid "Gas Used"
 msgstr "Použitá zmes"
 
@@ -483,11 +459,7 @@ msgstr "Zoznam"
 msgid "Liter"
 msgstr "Liter"
 
-#: 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 "Miesto"
 
@@ -495,7 +467,15 @@ msgstr "Miesto"
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:659
+#: statistics.c:167
+#, fuzzy
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+"\n"
+"Najdlhší"
+
+#: statistics.c:674
 msgid "Longest Dive"
 msgstr "Najdlhší ponor"
 
@@ -523,16 +503,15 @@ msgstr "Master"
 msgid "Max Deco Time Warning"
 msgstr "Upozornenie: Max. dekompresný čas"
 
-#: statistics.c:666
-#: statistics.c:704
+#: statistics.c:681 statistics.c:719
 msgid "Max Depth"
 msgstr "Max. hĺbka"
 
-#: statistics.c:674
+#: statistics.c:689
 msgid "Max SAC"
 msgstr "Max. spotreba"
 
-#: statistics.c:649
+#: statistics.c:664
 msgid "Max Temp"
 msgstr "Max. teplota"
 
@@ -551,6 +530,30 @@ msgstr ""
 msgid "MaxPress"
 msgstr "Max. tlak"
 
+#: statistics.c:170
+#, fuzzy
+msgctxt "Depth"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maximum"
+
+#: statistics.c:173
+#, fuzzy
+msgctxt "SAC"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maximum"
+
+#: statistics.c:176
+#, fuzzy
+msgctxt "Temp"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maximum"
+
 #: main.c:46
 msgid "May"
 msgstr "Máj"
@@ -567,18 +570,42 @@ msgstr "Spoj akciu s akciou pod"
 msgid "Meter"
 msgstr "Meter"
 
-#: statistics.c:667
+#: statistics.c:682
 msgid "Min Depth"
 msgstr "Min. hĺbka"
 
-#: statistics.c:675
+#: statistics.c:690
 msgid "Min SAC"
 msgstr "Min. spotreba"
 
-#: statistics.c:650
+#: statistics.c:665
 msgid "Min Temp"
 msgstr "Min. teplota"
 
+#: statistics.c:169
+#, fuzzy
+msgctxt "Depth"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Minimum"
+
+#: statistics.c:172
+#, fuzzy
+msgctxt "SAC"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Minimum"
+
+#: statistics.c:175
+#, fuzzy
+msgctxt "Temp"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Minimum"
+
 #: gtk-gui.c:656
 msgid "Misc. Options"
 msgstr "Rôzne voľby"
@@ -603,9 +630,7 @@ msgstr "Nové začiatočné číslo"
 msgid "No Tank Data"
 msgstr "Žiadne informácie o fľaši"
 
-#: info.c:463
-#: info.c:496
-#: info.c:919
+#: info.c:463 info.c:496 info.c:919
 msgid "Notes"
 msgstr "Poznámky"
 
@@ -613,9 +638,7 @@ msgstr "Poznámky"
 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"
 
@@ -647,12 +670,11 @@ msgstr "PO2 Upozornenie: Zelená"
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:570
-#: gtk-gui.c:913
+#: gtk-gui.c:570 gtk-gui.c:913
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
 msgid "Pressure"
 msgstr "Tlak"
 
@@ -696,8 +718,7 @@ msgstr "Alarm: zostávajúci čas plynu"
 msgid "RGT Warning"
 msgstr "Upozornenie: zostávajúci čas plynu"
 
-#: info.c:489
-#: info.c:916
+#: info.c:489 info.c:916
 msgid "Rating"
 msgstr "Rating"
 
@@ -718,8 +739,7 @@ msgstr "Vymaž ponor z akcie"
 msgid "Remove selected dives from trip"
 msgstr "Vymaž vybrané ponory z akcie"
 
-#: gtk-gui.c:802
-#: gtk-gui.c:914
+#: gtk-gui.c:802 gtk-gui.c:914
 msgid "Renumber"
 msgstr "Prečíslovanie"
 
@@ -727,20 +747,10 @@ msgstr "Prečíslovanie"
 msgid "Retry"
 msgstr "Skús znovu"
 
-#: 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 "Spotreba plynu"
 
-#: statistics.c:162
-msgid ""
-"SAC\n"
-"Average"
-msgstr ""
-"Priemerná\n"
-"spotreba plynu"
-
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE súbor"
@@ -769,8 +779,7 @@ msgstr "Uložiť zmeny?"
 msgid "Save File As"
 msgstr "Uložiť súbor ako"
 
-#: gtk-gui.c:762
-#: gtk-gui.c:916
+#: gtk-gui.c:762 gtk-gui.c:916
 msgid "SelectEvents"
 msgstr "Voľba udalosti"
 
@@ -786,7 +795,15 @@ msgstr ""
 "Čiastočný zápis do req.txt súboru\n"
 "Je Uemis Zurich korektne pripojený?"
 
-#: statistics.c:660
+#: statistics.c:166
+#, fuzzy
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+"\n"
+"Najkratší"
+
+#: statistics.c:675
 msgid "Shortest Dive"
 msgstr "Najkratší ponor"
 
@@ -794,7 +811,7 @@ msgstr "Najkratší ponor"
 msgid "Show Columns"
 msgstr "Zobraz stĺpce"
 
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -806,12 +823,11 @@ msgstr "Alarm: Rýchlosť"
 msgid "Speed Warning"
 msgstr "Upozornenie: Rýchlosť"
 
-#: equipment.c:962
-#: equipment.c:1488
+#: equipment.c:962 equipment.c:1488
 msgid "Start"
 msgstr "Štart"
 
-#: statistics.c:640
+#: statistics.c:655
 msgid "Statistics"
 msgstr "Štatistika"
 
@@ -819,10 +835,7 @@ msgstr "Štatistika"
 msgid "Stats"
 msgstr "Štatistiky"
 
-#: 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 "Oblek"
 
@@ -831,7 +844,7 @@ msgstr "Oblek"
 msgid "Sun"
 msgstr "Ne"
 
-#: statistics.c:698
+#: statistics.c:713
 msgid "Surf Intv"
 msgstr "Povrchový interval"
 
@@ -851,13 +864,10 @@ msgstr "Info: Tlak vo fľaši"
 msgid "Temp"
 msgstr "Teplota"
 
-#: statistics.c:162
-msgid ""
-"Temperature\n"
-"Average"
-msgstr ""
-"Teplota\n"
-"Priemer"
+#: statistics.c:160
+#, fuzzy
+msgid "Temperature"
+msgstr "Teplota:"
 
 #: gtk-gui.c:599
 msgid "Temperature:"
@@ -871,8 +881,7 @@ msgstr "Tri"
 msgid "Thu"
 msgstr "Št"
 
-#: info.c:791
-#: print.c:154
+#: info.c:791 print.c:154
 msgid "Time"
 msgstr "Čas"
 
@@ -880,7 +889,13 @@ msgstr "Čas"
 msgid "Toggle Zoom"
 msgstr "Zmeň zoom"
 
-#: statistics.c:657
+#: statistics.c:164
+#, fuzzy
+msgctxt "Duration"
+msgid "Total"
+msgstr "Celkový čas"
+
+#: statistics.c:672
 msgid "Total Time"
 msgstr "Celkový čas"
 
@@ -888,8 +903,7 @@ msgstr "Celkový čas"
 msgid "Tue"
 msgstr "Ut"
 
-#: equipment.c:1485
-#: equipment.c:1513
+#: equipment.c:1485 equipment.c:1513
 msgid "Type"
 msgstr "Typ"
 
@@ -929,7 +943,7 @@ msgstr "Náhľad"
 msgid "Volume:"
 msgstr "Objem:"
 
-#: statistics.c:706
+#: statistics.c:721
 msgid "Water Temp"
 msgstr "Teplota vody"
 
@@ -937,9 +951,7 @@ msgstr "Teplota vody"
 msgid "Wed"
 msgstr "St"
 
-#: equipment.c:1012
-#: equipment.c:1609
-#: gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
 msgid "Weight"
 msgstr "Závažie"
 
@@ -956,15 +968,10 @@ msgid "XML file"
 msgstr "XML súbor"
 
 #: statistics.c:160
-msgid ""
-"Year\n"
-" > Month"
+msgid "Year"
 msgstr ""
-"Rok\n"
-" > Mesiac"
 
-#: gtk-gui.c:915
-#: statistics.c:345
+#: gtk-gui.c:915 statistics.c:360
 msgid "Yearly Statistics"
 msgstr "Ročná štatistika"
 
@@ -1013,8 +1020,7 @@ msgstr "integrovaný"
 msgid "kg"
 msgstr "kg"
 
-#: divelist.c:1263
-#: gtk-gui.c:606
+#: divelist.c:1263 gtk-gui.c:606
 msgid "lbs"
 msgstr "US libra"
 
@@ -1022,17 +1028,16 @@ msgstr "US libra"
 msgid "min"
 msgstr "min"
 
-#: statistics.c:478
+#: statistics.c:493
 #, c-format
 msgid "more than %d days"
 msgstr "viac než %d dní"
 
-#: equipment.c:1378
-#: equipment.c:1398
+#: equipment.c:1378 equipment.c:1398
 msgid "unkn"
 msgstr "nez."
 
-#: statistics.c:517
+#: statistics.c:532
 msgid "unknown"
 msgstr "neznámy"
 
@@ -1044,3 +1049,46 @@ msgstr "nešpecifikovaný"
 msgid "weight"
 msgstr "hmotnosť"
 
+#, fuzzy
+#~ msgctxt "Depth"
+#~ msgid ""
+#~ "Depth\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Priemerná\n"
+#~ "Hĺbka"
+
+#, fuzzy
+#~ msgctxt "Duration"
+#~ msgid ""
+#~ "Duration\n"
+#~ "Total"
+#~ msgstr ""
+#~ "Dĺžka\n"
+#~ "Celková"
+
+#, fuzzy
+#~ msgctxt "SAC"
+#~ msgid ""
+#~ "SAC\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Priemerná\n"
+#~ "spotreba plynu"
+
+#, fuzzy
+#~ msgid ""
+#~ "SAC|\n"
+#~ "Minimum"
+#~ msgstr ""
+#~ "\n"
+#~ "Minimum"
+
+#, fuzzy
+#~ msgctxt "Temp"
+#~ msgid ""
+#~ "Temperature\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Teplota\n"
+#~ "Priemer"