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, 204 insertions, 112 deletions

diff --git a/po/bg_BG.po b/po/bg_BG.po
index 41551ac0f..9ab12e2bc 100644
--- a/po/bg_BG.po
+++ b/po/bg_BG.po
@@ -1,7 +1,7 @@
-# Bulgarian translations for PACKAGE package
-# Bugarian messages for PACKAGE.
-# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Bulgarian translations for Subsurface package
+# Bugarian messages for Subsurface.
+# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Subsurface package.
 #
 # Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 #
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-11 23:06+0300\n"
+"POT-Creation-Date: 2012-10-14 20:42-0700\n"
 "PO-Revision-Date: 2012-11-10 16:27+0300\n"
 "Last-Translator: Lubomir I. Ivanov <neolit123@gmail.com>>\n"
 "Language-Team: Bulgarian\n"
@@ -19,66 +19,38 @@ 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"
-"Най-дълъг"
-
-#: statistics.c:162 statistics.c:163
-msgid ""
-"\n"
-"Maximum"
-msgstr ""
-"\n"
-"Максимум"
-
-#: statistics.c:161 statistics.c:162 statistics.c:163
-msgid ""
-"\n"
-"Minimum"
-msgstr ""
-"\n"
-"Минимум"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Shortest"
+#: statistics.c:162
+#, fuzzy
+msgctxt "Stats"
+msgid " > Month"
 msgstr ""
-"\n"
-"Най-къс"
+"Година\n"
+" > Месец"
 
 #: gtk-gui.c:1502
 msgid " Please select dive computer and device. "
 msgstr " Моля изберете леководолазен компютър и устройство. "
 
-#: 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/мин"
 
-#: print.c:252 statistics.c:512
+#: print.c:252 statistics.c:527
 #, c-format
 msgid "%d min"
 msgstr "%d мин"
 
-#: statistics.c:484
+#: statistics.c:499
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dд %dч %dмин"
 
-#: statistics.c:486
+#: statistics.c:501
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dч %dмин"
@@ -120,20 +92,52 @@ msgstr "Автоматично групиране"
 msgid "Automatically group dives in trips"
 msgstr "Автоматично групиране на гмуркания в пътувания"
 
-#: statistics.c:668 statistics.c:705
+#: statistics.c:168
+#, fuzzy
+msgctxt "Depth"
+msgid "Average"
+msgstr ""
+"\n"
+"Средно"
+
+#: statistics.c:165
+#, fuzzy
+msgctxt "Duration"
+msgid "Average"
+msgstr ""
+"\n"
+"Средно"
+
+#: statistics.c:171
+#, fuzzy
+msgctxt "SAC"
+msgid "Average"
+msgstr ""
+"\n"
+"Средно"
+
+#: statistics.c:174
+#, fuzzy
+msgctxt "Temp"
+msgid "Average"
+msgstr ""
+"\n"
+"Средно"
+
+#: statistics.c:683 statistics.c:720
 msgid "Avg Depth"
 msgstr "Средна дълбочина"
 
-#: statistics.c:676
+#: statistics.c:691
 msgid "Avg SAC"
 msgstr "Средно ППК"
-# ППК = Повърхностно Потребление на Кислород 
 
-#: statistics.c:651
+# ППК = Повърхностно Потребление на Кислород 
+#: statistics.c:666
 msgid "Avg Temp"
 msgstr "Средна Темп."
 
-#: statistics.c:658
+#: statistics.c:673
 msgid "Avg Time"
 msgstr "Средно Време"
 
@@ -185,7 +189,7 @@ msgstr "Бутилка"
 msgid "Cylinders"
 msgstr "Бутилки"
 
-#: divelist.c:1258 print.c:154 statistics.c:696
+#: divelist.c:1258 print.c:154 statistics.c:711
 msgid "Date"
 msgstr "Дата"
 
@@ -221,18 +225,10 @@ msgstr "Изтрий гмуркане"
 msgid "Delete dives"
 msgstr "Изтрий гмуркания"
 
-#: print.c:154
+#: print.c:154 statistics.c:160
 msgid "Depth"
 msgstr "Дълбочина"
 
-#: statistics.c:161
-msgid ""
-"Depth\n"
-"Average"
-msgstr ""
-"Дълбочина\n"
-"Средна"
-
 #: info.c:836
 #, c-format
 msgid "Depth (%s):"
@@ -265,7 +261,7 @@ msgstr "Гмуркане #%d - %s"
 msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
 msgstr "Гмуркане #%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 "Информация"
 
@@ -273,7 +269,7 @@ msgstr "Информация"
 msgid "Dive Notes"
 msgstr "Бележки"
 
-#: statistics.c:697
+#: statistics.c:712
 msgid "Dive Time"
 msgstr "Време"
 
@@ -309,7 +305,7 @@ msgstr "Шрифт за Списъка на Гмуркания"
 msgid "Divemaster"
 msgstr "Водач"
 
-#: statistics.c:648
+#: statistics.c:663
 msgid "Dives"
 msgstr "Гмуркания"
 
@@ -318,12 +314,9 @@ msgid "Download From Dive Computer"
 msgstr "Изтегли от Леководолазен Компютър"
 
 #: statistics.c:160
-msgid ""
-"Duration\n"
-"Total"
-msgstr ""
-"Продължителност\n"
-"Тотално"
+#, fuzzy
+msgid "Duration"
+msgstr "Продължителност (мин.)"
 
 #: info.c:831
 msgid "Duration (min)"
@@ -422,7 +415,7 @@ msgstr "Филтър"
 msgid "Fri"
 msgstr "Пет"
 
-#: statistics.c:715
+#: statistics.c:730
 msgid "Gas Used"
 msgstr "Използван Газ"
 
@@ -475,7 +468,15 @@ msgstr "Местоположение"
 msgid "Log"
 msgstr "Регистър"
 
-#: statistics.c:659
+#: statistics.c:167
+#, fuzzy
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+"\n"
+"Най-дълъг"
+
+#: statistics.c:674
 msgid "Longest Dive"
 msgstr "Най-дълго Гмуркане"
 
@@ -503,15 +504,15 @@ msgstr "Главен"
 msgid "Max Deco Time Warning"
 msgstr "Внимание: Максимално Време на Сигнал за Декомпресия"
 
-#: statistics.c:666 statistics.c:704
+#: statistics.c:681 statistics.c:719
 msgid "Max Depth"
 msgstr "Максимална Дълбочина"
 
-#: statistics.c:674
+#: statistics.c:689
 msgid "Max SAC"
 msgstr "Максимално ППК"
 
-#: statistics.c:649
+#: statistics.c:664
 msgid "Max Temp"
 msgstr "Максимална Температура"
 
@@ -530,6 +531,30 @@ msgstr ""
 msgid "MaxPress"
 msgstr "Максимално Налягане"
 
+#: statistics.c:170
+#, fuzzy
+msgctxt "Depth"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Максимум"
+
+#: statistics.c:173
+#, fuzzy
+msgctxt "SAC"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Максимум"
+
+#: statistics.c:176
+#, fuzzy
+msgctxt "Temp"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Максимум"
+
 #: main.c:46
 msgid "May"
 msgstr "Май"
@@ -546,18 +571,42 @@ msgstr "Слей пътуване с долно пътуване"
 msgid "Meter"
 msgstr "Метър"
 
-#: statistics.c:667
+#: statistics.c:682
 msgid "Min Depth"
 msgstr "Минимална Дълбочина"
 
-#: statistics.c:675
+#: statistics.c:690
 msgid "Min SAC"
 msgstr "Минимално ППК"
 
-#: statistics.c:650
+#: statistics.c:665
 msgid "Min Temp"
 msgstr "Минимална Температура"
 
+#: statistics.c:169
+#, fuzzy
+msgctxt "Depth"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Минимум"
+
+#: statistics.c:172
+#, fuzzy
+msgctxt "SAC"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Минимум"
+
+#: statistics.c:175
+#, fuzzy
+msgctxt "Temp"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Минимум"
+
 #: gtk-gui.c:656
 msgid "Misc. Options"
 msgstr "Общи Настройки"
@@ -590,11 +639,11 @@ msgstr "Бележки"
 msgid "Nov"
 msgstr "Нов"
 
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:713
+#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
 msgid "OTU"
 msgstr "Апарат за Поносимост на Кислород"
-# Апарат За Поносимост На Кислород?
 
+# Апарат За Поносимост На Кислород?
 #: main.c:47
 msgid "Oct"
 msgstr "Окт"
@@ -627,7 +676,7 @@ msgstr "PSI"
 msgid "Preferences"
 msgstr "Настройки"
 
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
 msgid "Pressure"
 msgstr "Налягане"
 
@@ -700,18 +749,10 @@ msgstr "Преномерирай"
 msgid "Retry"
 msgstr "Опитай пак"
 
-#: 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 "ППК"
 
-#: statistics.c:162
-msgid ""
-"SAC\n"
-"Average"
-msgstr ""
-"ППК\n"
-"Средно"
-
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE файл"
@@ -756,7 +797,15 @@ msgstr ""
 "Кратък запис в req.txt файл\n"
 "Uemis Zurich включен ли е правилно?"
 
-#: statistics.c:660
+#: statistics.c:166
+#, fuzzy
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+"\n"
+"Най-къс"
+
+#: statistics.c:675
 msgid "Shortest Dive"
 msgstr "Най-кратко Гмуркане"
 
@@ -764,7 +813,7 @@ msgstr "Най-кратко Гмуркане"
 msgid "Show Columns"
 msgstr "Покажи Колони"
 
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
 msgid "Size"
 msgstr "Големина"
 
@@ -780,7 +829,7 @@ msgstr "Внимание: Скорост"
 msgid "Start"
 msgstr "Старт"
 
-#: statistics.c:640
+#: statistics.c:655
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -797,7 +846,7 @@ msgstr "Водолазен Костюм"
 msgid "Sun"
 msgstr "Нед"
 
-#: statistics.c:698
+#: statistics.c:713
 msgid "Surf Intv"
 msgstr "Време На Повърхността"
 
@@ -817,13 +866,10 @@ msgstr "Информация: Налагане на Резервоар"
 msgid "Temp"
 msgstr "Температура"
 
-#: statistics.c:162
-msgid ""
-"Temperature\n"
-"Average"
-msgstr ""
-"Температура\n"
-"Средна"
+#: statistics.c:160
+#, fuzzy
+msgid "Temperature"
+msgstr "Температура:"
 
 #: gtk-gui.c:599
 msgid "Temperature:"
@@ -845,7 +891,13 @@ msgstr "Време"
 msgid "Toggle Zoom"
 msgstr "Превключване на Зуум"
 
-#: statistics.c:657
+#: statistics.c:164
+#, fuzzy
+msgctxt "Duration"
+msgid "Total"
+msgstr "Общо Време"
+
+#: statistics.c:672
 msgid "Total Time"
 msgstr "Общо Време"
 
@@ -893,7 +945,7 @@ msgstr "Изглед"
 msgid "Volume:"
 msgstr "Обем:"
 
-#: statistics.c:706
+#: statistics.c:721
 msgid "Water Temp"
 msgstr "Температура на Водата"
 
@@ -918,14 +970,10 @@ msgid "XML file"
 msgstr "XML файл"
 
 #: statistics.c:160
-msgid ""
-"Year\n"
-" > Month"
+msgid "Year"
 msgstr ""
-"Година\n"
-" > Месец"
 
-#: gtk-gui.c:915 statistics.c:345
+#: gtk-gui.c:915 statistics.c:360
 msgid "Yearly Statistics"
 msgstr "Годишни статистики"
 
@@ -982,7 +1030,7 @@ msgstr "паунда"
 msgid "min"
 msgstr "мин"
 
-#: statistics.c:478
+#: statistics.c:493
 #, c-format
 msgid "more than %d days"
 msgstr "повече от %d дни"
@@ -991,7 +1039,7 @@ msgstr "повече от %d дни"
 msgid "unkn"
 msgstr "неизв."
 
-#: statistics.c:517
+#: statistics.c:532
 msgid "unknown"
 msgstr "неизвестен"
 
@@ -1002,3 +1050,47 @@ msgstr "неопределен"
 #: equipment.c:1514
 msgid "weight"
 msgstr "тегло"
+
+#, fuzzy
+#~ msgctxt "Depth"
+#~ msgid ""
+#~ "Depth\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Дълбочина\n"
+#~ "Средна"
+
+#, fuzzy
+#~ msgctxt "Duration"
+#~ msgid ""
+#~ "Duration\n"
+#~ "Total"
+#~ msgstr ""
+#~ "Продължителност\n"
+#~ "Тотално"
+
+#, fuzzy
+#~ msgctxt "SAC"
+#~ msgid ""
+#~ "SAC\n"
+#~ "Average"
+#~ msgstr ""
+#~ "ППК\n"
+#~ "Средно"
+
+#, fuzzy
+#~ msgid ""
+#~ "SAC|\n"
+#~ "Minimum"
+#~ msgstr ""
+#~ "\n"
+#~ "Минимум"
+
+#, fuzzy
+#~ msgctxt "Temp"
+#~ msgid ""
+#~ "Temperature\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Температура\n"
+#~ "Средна"