summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2012-10-14 20:43:32 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-10-14 20:47:00 -0700
commitf1569a206e58b521fdf4b425b06f8953f4dbdaf3 (patch)
treedcfdbf951514c88c21528a26a3c6fd06cf9d7834
parenta3e7a46f1281d07fdbb6deefd992f597fc1bc07b (diff)
downloadsubsurface-f1569a206e58b521fdf4b425b06f8953f4dbdaf3.tar.gz
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>
-rw-r--r--equipment.c4
-rw-r--r--po/bg_BG.po316
-rw-r--r--po/de_DE.po270
-rw-r--r--po/fi_FI.po391
-rw-r--r--po/fr_FR.po313
-rw-r--r--po/nl_NL.po312
-rw-r--r--po/no_NO.po312
-rw-r--r--po/sk_SK.po394
-rw-r--r--po/sv_SE.po391
-rw-r--r--statistics.c27
10 files changed, 1651 insertions, 1079 deletions
diff --git a/equipment.c b/equipment.c
index 1a6de41d7..8371e490a 100644
--- a/equipment.c
+++ b/equipment.c
@@ -948,10 +948,10 @@ static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, G
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
- widget = create_spinbutton(hbox, "Size", 0, 300, 0.1);
+ widget = create_spinbutton(hbox, _("Size"), 0, 300, 0.1);
cylinder->size = GTK_SPIN_BUTTON(widget);
- widget = create_spinbutton(hbox, "Pressure", 0, 5000, 1);
+ widget = create_spinbutton(hbox, _("Pressure"), 0, 5000, 1);
cylinder->pressure = GTK_SPIN_BUTTON(widget);
/*
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"
+#~ "Средна"
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"
+#~ "Ø"
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."
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 583ec60a8..f80e62fe3 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,15 +1,16 @@
-# Dutch translations for 2.0.1 package
-# Dutch 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.
+# French translations for Subsurface package
+# French 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.
# Jacco van Koll <jacco.van.koll@gmail.com>, 2012
+# Pierre-Yves Chibon <pingou@pingoured.fr>, 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-12-11 09:58+0200\n"
"Last-Translator: Pierre-Yves Chibon <pingou@pingoured.fr>\n"
"Language-Team: French\n"
@@ -19,66 +20,38 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:160
-msgid ""
-"\n"
-"Average"
-msgstr ""
-"\n"
-"Moyenne"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Longest"
-msgstr ""
-"\n"
-"Plus longue"
-
-#: 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"
+#: statistics.c:162
+#, fuzzy
+msgctxt "Stats"
+msgid " > Month"
msgstr ""
-"\n"
-"Plus courte"
+"Année\n"
+" > Mois"
#: gtk-gui.c:1502
msgid " Please select dive computer and device. "
msgstr " Merci de choisir un ordinateur de plongée et un port "
-#: 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 %dh %dmin"
-#: statistics.c:486
+#: statistics.c:501
#, c-format
msgid "%dh %dmin"
msgstr "%dh %dmin"
@@ -120,19 +93,51 @@ msgstr "Grouper automatiquement"
msgid "Automatically group dives in trips"
msgstr "Grouper automatiquement les plongées"
-#: statistics.c:668 statistics.c:705
+#: statistics.c:168
+#, fuzzy
+msgctxt "Depth"
+msgid "Average"
+msgstr ""
+"\n"
+"Moyenne"
+
+#: statistics.c:165
+#, fuzzy
+msgctxt "Duration"
+msgid "Average"
+msgstr ""
+"\n"
+"Moyenne"
+
+#: statistics.c:171
+#, fuzzy
+msgctxt "SAC"
+msgid "Average"
+msgstr ""
+"\n"
+"Moyenne"
+
+#: statistics.c:174
+#, fuzzy
+msgctxt "Temp"
+msgid "Average"
+msgstr ""
+"\n"
+"Moyenne"
+
+#: statistics.c:683 statistics.c:720
msgid "Avg Depth"
msgstr "Profondeur moy."
-#: statistics.c:676
+#: statistics.c:691
msgid "Avg SAC"
msgstr "Consomation d'air moyenne"
-#: statistics.c:651
+#: statistics.c:666
msgid "Avg Temp"
msgstr "Température Moy."
-#: statistics.c:658
+#: statistics.c:673
msgid "Avg Time"
msgstr "Temps Moy."
@@ -184,7 +189,7 @@ msgstr "Block"
msgid "Cylinders"
msgstr "Blocks"
-#: divelist.c:1258 print.c:154 statistics.c:696
+#: divelist.c:1258 print.c:154 statistics.c:711
msgid "Date"
msgstr "Date"
@@ -220,18 +225,10 @@ msgstr "Supprimer plongée"
msgid "Delete dives"
msgstr "Supprimer plongées"
-#: print.c:154
+#: print.c:154 statistics.c:160
msgid "Depth"
msgstr "Profondeur"
-#: statistics.c:161
-msgid ""
-"Depth\n"
-"Average"
-msgstr ""
-"Profondeur\n"
-"Moyenne"
-
#: info.c:836
#, c-format
msgid "Depth (%s):"
@@ -264,7 +261,7 @@ msgstr "Plongée #%d - %s"
msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
msgstr "Plongée #%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 "Détails Plongée"
@@ -272,7 +269,7 @@ msgstr "Détails Plongée"
msgid "Dive Notes"
msgstr "Notes de Plongée"
-#: statistics.c:697
+#: statistics.c:712
msgid "Dive Time"
msgstr "Temps de Plongée"
@@ -308,7 +305,7 @@ msgstr "Police pour la liste de plongée"
msgid "Divemaster"
msgstr "Chef de Palanquée"
-#: statistics.c:648
+#: statistics.c:663
msgid "Dives"
msgstr "Plongées"
@@ -317,12 +314,9 @@ msgid "Download From Dive Computer"
msgstr "Télécharger de l'ordinateur de plongée"
#: statistics.c:160
-msgid ""
-"Duration\n"
-"Total"
-msgstr ""
-"Durée\n"
-"Totale"
+#, fuzzy
+msgid "Duration"
+msgstr "Durée (min)"
#: info.c:831
msgid "Duration (min)"
@@ -421,7 +415,7 @@ msgstr "Filtrer"
msgid "Fri"
msgstr "Ven"
-#: statistics.c:715
+#: statistics.c:730
msgid "Gas Used"
msgstr "Air Utilisé"
@@ -474,7 +468,15 @@ msgstr "Location"
msgid "Log"
msgstr "Journal"
-#: statistics.c:659
+#: statistics.c:167
+#, fuzzy
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+"\n"
+"Plus longue"
+
+#: statistics.c:674
msgid "Longest Dive"
msgstr "Plongée la plus longue"
@@ -502,15 +504,15 @@ msgstr "Chef"
msgid "Max Deco Time Warning"
msgstr "Attention: Temps de Decopression Maximum"
-#: statistics.c:666 statistics.c:704
+#: statistics.c:681 statistics.c:719
msgid "Max Depth"
msgstr "Prof. Maximal"
-#: statistics.c:674
+#: statistics.c:689
msgid "Max SAC"
msgstr "Consommation d'air Max."
-#: statistics.c:649
+#: statistics.c:664
msgid "Max Temp"
msgstr "Temp. Max."
@@ -529,6 +531,30 @@ msgstr ""
msgid "MaxPress"
msgstr "PressionMax"
+#: 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 "Mai"
@@ -545,18 +571,42 @@ msgstr "Intégrer groupe dans le groupe en-dessous"
msgid "Meter"
msgstr "Metre"
-#: statistics.c:667
+#: statistics.c:682
msgid "Min Depth"
msgstr "Profondeur Min."
-#: statistics.c:675
+#: statistics.c:690
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:650
+#: statistics.c:665
msgid "Min Temp"
msgstr "Temp. Min."
+#: 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 "Options divers"
@@ -589,7 +639,7 @@ msgstr "Notes"
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 +676,7 @@ msgstr "PSI"
msgid "Preferences"
msgstr "Preferences"
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
msgid "Pressure"
msgstr "Pression"
@@ -700,18 +750,10 @@ msgstr "Re-numéroter"
msgid "Retry"
msgstr "Re-essayer"
-#: 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 "Consommation d'air"
-#: statistics.c:162
-msgid ""
-"SAC\n"
-"Average"
-msgstr ""
-"Consommation d'air moyenne\n"
-"Moyenne"
-
#: file.c:75
msgid "SDE file"
msgstr "Fichier SDE"
@@ -757,7 +799,15 @@ msgstr ""
"Écriture partiel des progrès dans le fichier req.txt\n"
"Est-ce que votre Uemis Zurich est branché correctement ?"
-#: statistics.c:660
+#: statistics.c:166
+#, fuzzy
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+"\n"
+"Plus courte"
+
+#: statistics.c:675
msgid "Shortest Dive"
msgstr "Plongée la plus courte"
@@ -765,7 +815,7 @@ msgstr "Plongée la plus courte"
msgid "Show Columns"
msgstr "Affichier colonne"
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
msgid "Size"
msgstr "Taille"
@@ -781,7 +831,7 @@ msgstr "Attention: vitesse"
msgid "Start"
msgstr "Début"
-#: statistics.c:640
+#: statistics.c:655
msgid "Statistics"
msgstr "Statistiques"
@@ -798,7 +848,7 @@ msgstr "Combinaison"
msgid "Sun"
msgstr "Dim"
-#: statistics.c:698
+#: statistics.c:713
msgid "Surf Intv"
msgstr "Interval de surface"
@@ -818,13 +868,10 @@ msgstr "Information: Pression block"
msgid "Temp"
msgstr "Température"
-#: statistics.c:162
-msgid ""
-"Temperature\n"
-"Average"
-msgstr ""
-"Température\n"
-"Moyenne"
+#: statistics.c:160
+#, fuzzy
+msgid "Temperature"
+msgstr "Température:"
#: gtk-gui.c:599
msgid "Temperature:"
@@ -846,7 +893,13 @@ msgstr "Temps"
msgid "Toggle Zoom"
msgstr "Zoom avant/arrière"
-#: statistics.c:657
+#: statistics.c:164
+#, fuzzy
+msgctxt "Duration"
+msgid "Total"
+msgstr "Temps Total"
+
+#: statistics.c:672
msgid "Total Time"
msgstr "Temps Total"
@@ -894,7 +947,7 @@ msgstr "Vue"
msgid "Volume:"
msgstr "Volume:"
-#: statistics.c:706
+#: statistics.c:721
msgid "Water Temp"
msgstr "Température de l'eau"
@@ -919,14 +972,10 @@ msgid "XML file"
msgstr "Fichier XML"
#: statistics.c:160
-msgid ""
-"Year\n"
-" > Month"
+msgid "Year"
msgstr ""
-"Année\n"
-" > Mois"
-#: gtk-gui.c:915 statistics.c:345
+#: gtk-gui.c:915 statistics.c:360
msgid "Yearly Statistics"
msgstr "Statistiques annuelles"
@@ -983,7 +1032,7 @@ msgstr "US Pond"
msgid "min"
msgstr "min"
-#: statistics.c:478
+#: statistics.c:493
#, c-format
msgid "more than %d days"
msgstr "Plus de %d jours"
@@ -992,7 +1041,7 @@ msgstr "Plus de %d jours"
msgid "unkn"
msgstr "inconnu"
-#: statistics.c:517
+#: statistics.c:532
msgid "unknown"
msgstr "inconnu"
@@ -1003,3 +1052,47 @@ msgstr "non-specifié"
#: equipment.c:1514
msgid "weight"
msgstr "poid"
+
+#, fuzzy
+#~ msgctxt "Depth"
+#~ msgid ""
+#~ "Depth\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Profondeur\n"
+#~ "Moyenne"
+
+#, fuzzy
+#~ msgctxt "Duration"
+#~ msgid ""
+#~ "Duration\n"
+#~ "Total"
+#~ msgstr ""
+#~ "Durée\n"
+#~ "Totale"
+
+#, fuzzy
+#~ msgctxt "SAC"
+#~ msgid ""
+#~ "SAC\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Consommation d'air moyenne\n"
+#~ "Moyenne"
+
+#, fuzzy
+#~ msgid ""
+#~ "SAC|\n"
+#~ "Minimum"
+#~ msgstr ""
+#~ "\n"
+#~ "Minimum"
+
+#, fuzzy
+#~ msgctxt "Temp"
+#~ msgid ""
+#~ "Temperature\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Température\n"
+#~ "Moyenne"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 89134e732..00b7085d9 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,7 +1,7 @@
-# Dutch translations for 2.0.1 package
-# Dutch 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.
+# Dutch translations for Subsurface package
+# Dutch 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.
# Jacco van Koll <jacco.van.koll@gmail.com>, 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-11 13:08+0100\n"
"Last-Translator: Jacco van Koll <jacco.van.koll@gmail.com>\n"
"Language-Team: Dutch\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"
-"Gemiddelde"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Longest"
-msgstr ""
-"\n"
-"Langste"
-
-#: statistics.c:162 statistics.c:163
-msgid ""
-"\n"
-"Maximum"
-msgstr ""
-"\n"
-"Grootste"
-
-#: statistics.c:161 statistics.c:162 statistics.c:163
-msgid ""
-"\n"
-"Minimum"
-msgstr ""
-"\n"
-"Kleinste"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Shortest"
+#: statistics.c:162
+#, fuzzy
+msgctxt "Stats"
+msgid " > Month"
msgstr ""
-"\n"
-"Kortste"
+"Jaar\n"
+" > Maand"
#: gtk-gui.c:1502
msgid " Please select dive computer and device. "
msgstr " Selecteer duikcomputer en aansluiting. "
-#: 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"
@@ -120,19 +92,51 @@ msgstr "Automatisch groeperen"
msgid "Automatically group dives in trips"
msgstr "Automatisch de duiken in trips groeperen"
-#: statistics.c:668 statistics.c:705
+#: statistics.c:168
+#, fuzzy
+msgctxt "Depth"
+msgid "Average"
+msgstr ""
+"\n"
+"Gemiddelde"
+
+#: statistics.c:165
+#, fuzzy
+msgctxt "Duration"
+msgid "Average"
+msgstr ""
+"\n"
+"Gemiddelde"
+
+#: statistics.c:171
+#, fuzzy
+msgctxt "SAC"
+msgid "Average"
+msgstr ""
+"\n"
+"Gemiddelde"
+
+#: statistics.c:174
+#, fuzzy
+msgctxt "Temp"
+msgid "Average"
+msgstr ""
+"\n"
+"Gemiddelde"
+
+#: statistics.c:683 statistics.c:720
msgid "Avg Depth"
msgstr "Gem. diepte"
-#: statistics.c:676
+#: statistics.c:691
msgid "Avg SAC"
msgstr "Gem. gasverbruik"
-#: statistics.c:651
+#: statistics.c:666
msgid "Avg Temp"
msgstr "Gem. Temperatuur"
-#: statistics.c:658
+#: statistics.c:673
msgid "Avg Time"
msgstr "Gemiddelde tijd"
@@ -184,7 +188,7 @@ msgstr "Fles"
msgid "Cylinders"
msgstr "Flessen"
-#: divelist.c:1258 print.c:154 statistics.c:696
+#: divelist.c:1258 print.c:154 statistics.c:711
msgid "Date"
msgstr "Datum"
@@ -220,18 +224,10 @@ msgstr "Duik verwijderen"
msgid "Delete dives"
msgstr "Duiken verwijderen"
-#: print.c:154
+#: print.c:154 statistics.c:160
msgid "Depth"
msgstr "Diepte"
-#: statistics.c:161
-msgid ""
-"Depth\n"
-"Average"
-msgstr ""
-"Diepte\n"
-"Gemiddeld"
-
#: info.c:836
#, c-format
msgid "Depth (%s):"
@@ -264,7 +260,7 @@ msgstr "Duik #%d - %s"
msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
msgstr "Duik #%d - %s %02d/%02d/%04d om %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 "Duik informatie"
@@ -272,7 +268,7 @@ msgstr "Duik informatie"
msgid "Dive Notes"
msgstr "Duiknotities"
-#: statistics.c:697
+#: statistics.c:712
msgid "Dive Time"
msgstr "Duiktijd"
@@ -308,7 +304,7 @@ msgstr "Duiklijst Font"
msgid "Divemaster"
msgstr "Duik-instructeur"
-#: statistics.c:648
+#: statistics.c:663
msgid "Dives"
msgstr "Duiken"
@@ -317,12 +313,9 @@ msgid "Download From Dive Computer"
msgstr "Download uit duikcomputer"
#: statistics.c:160
-msgid ""
-"Duration\n"
-"Total"
-msgstr ""
-"Duur\n"
-"Totaal"
+#, fuzzy
+msgid "Duration"
+msgstr "Duur (min)"
#: info.c:831
msgid "Duration (min)"
@@ -421,7 +414,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "Vr"
-#: statistics.c:715
+#: statistics.c:730
msgid "Gas Used"
msgstr "Gas verbruikt"
@@ -474,7 +467,15 @@ msgstr "Locatie"
msgid "Log"
msgstr "Log"
-#: statistics.c:659
+#: statistics.c:167
+#, fuzzy
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+"\n"
+"Langste"
+
+#: statistics.c:674
msgid "Longest Dive"
msgstr "Langste duik"
@@ -502,15 +503,15 @@ msgstr "Master"
msgid "Max Deco Time Warning"
msgstr "Warnung: Maximale Deco tijd"
-#: statistics.c:666 statistics.c:704
+#: statistics.c:681 statistics.c:719
msgid "Max Depth"
msgstr "Max. Diepte"
-#: statistics.c:674
+#: statistics.c:689
msgid "Max SAC"
msgstr "Max. Gasverbruik"
-#: statistics.c:649
+#: statistics.c:664
msgid "Max Temp"
msgstr "Max. Temp."
@@ -529,6 +530,30 @@ msgstr ""
msgid "MaxPress"
msgstr "Max.Druk"
+#: statistics.c:170
+#, fuzzy
+msgctxt "Depth"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Grootste"
+
+#: statistics.c:173
+#, fuzzy
+msgctxt "SAC"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Grootste"
+
+#: statistics.c:176
+#, fuzzy
+msgctxt "Temp"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Grootste"
+
#: main.c:46
msgid "May"
msgstr "Mei"
@@ -545,18 +570,42 @@ msgstr "Trip met onderstaande samenvoegen"
msgid "Meter"
msgstr "Meter"
-#: statistics.c:667
+#: statistics.c:682
msgid "Min Depth"
msgstr "Min. diepte"
-#: statistics.c:675
+#: statistics.c:690
msgid "Min SAC"
msgstr "Min. Gasverbruik"
-#: statistics.c:650
+#: statistics.c:665
msgid "Min Temp"
msgstr "Min. Temp."
+#: statistics.c:169
+#, fuzzy
+msgctxt "Depth"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Kleinste"
+
+#: statistics.c:172
+#, fuzzy
+msgctxt "SAC"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Kleinste"
+
+#: statistics.c:175
+#, fuzzy
+msgctxt "Temp"
+msgid "Minimum"
+msgstr ""
+"\n"
+"Kleinste"
+
#: gtk-gui.c:656
msgid "Misc. Options"
msgstr "Diverse opties"
@@ -589,7 +638,7 @@ msgstr "Notities"
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 +675,7 @@ msgstr "psi"
msgid "Preferences"
msgstr "Instellingen"
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
msgid "Pressure"
msgstr "Druk"
@@ -700,18 +749,10 @@ msgstr "Hernummeren"
msgid "Retry"
msgstr "Opnieuw"
-#: 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 "Gas verbruiksratio"
-#: statistics.c:162
-msgid ""
-"SAC\n"
-"Average"
-msgstr ""
-"Gas verbruiksratio\n"
-"Gemiddeld"
-
#: file.c:75
msgid "SDE file"
msgstr "SDE bestand"
@@ -757,7 +798,15 @@ msgstr ""
"Gedeeltelijke schrijfvoortgang naar req.txt bestand\n"
"Is de Uemis Zurich correkt aangesloten?"
-#: statistics.c:660
+#: statistics.c:166
+#, fuzzy
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+"\n"
+"Kortste"
+
+#: statistics.c:675
msgid "Shortest Dive"
msgstr "Kortste duik"
@@ -765,7 +814,7 @@ msgstr "Kortste duik"
msgid "Show Columns"
msgstr "Kolommen afbeelden"
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
msgid "Size"
msgstr "Grootte"
@@ -781,7 +830,7 @@ msgstr "Warnung: snelheid"
msgid "Start"
msgstr "Start"
-#: statistics.c:640
+#: statistics.c:655
msgid "Statistics"
msgstr "Statistieken"
@@ -798,7 +847,7 @@ msgstr "Pak"
msgid "Sun"
msgstr "Zo"
-#: statistics.c:698
+#: statistics.c:713
msgid "Surf Intv"
msgstr "Oppervlaktetijd"
@@ -818,13 +867,10 @@ msgstr "Info: Flesdruk"
msgid "Temp"
msgstr "Temperatuur"
-#: statistics.c:162
-msgid ""
-"Temperature\n"
-"Average"
-msgstr ""
-"Temperatuur\n"
-"Gemiddeld"
+#: statistics.c:160
+#, fuzzy
+msgid "Temperature"
+msgstr "Temperatuur:"
#: gtk-gui.c:599
msgid "Temperature:"
@@ -846,7 +892,13 @@ msgstr "Tijd"
msgid "Toggle Zoom"
msgstr "Zoom in-/uitschakelen"
-#: statistics.c:657
+#: statistics.c:164
+#, fuzzy
+msgctxt "Duration"
+msgid "Total"
+msgstr "Totale tijd"
+
+#: statistics.c:672
msgid "Total Time"
msgstr "Totale tijd"
@@ -894,7 +946,7 @@ msgstr "Aanzicht"
msgid "Volume:"
msgstr "Volume:"
-#: statistics.c:706
+#: statistics.c:721
msgid "Water Temp"
msgstr "Watertemperatuur"
@@ -919,14 +971,10 @@ msgid "XML file"
msgstr "XML bestand"
#: statistics.c:160
-msgid ""
-"Year\n"
-" > Month"
+msgid "Year"
msgstr ""
-"Jaar\n"
-" > Maand"
-#: gtk-gui.c:915 statistics.c:345
+#: gtk-gui.c:915 statistics.c:360
msgid "Yearly Statistics"
msgstr "Jaarlijkse statistieken"
@@ -983,7 +1031,7 @@ msgstr "US Pond"
msgid "min"
msgstr "min"
-#: statistics.c:478
+#: statistics.c:493
#, c-format
msgid "more than %d days"
msgstr "Meer dan %d dagen"
@@ -992,7 +1040,7 @@ msgstr "Meer dan %d dagen"
msgid "unkn"
msgstr "Onbek"
-#: statistics.c:517
+#: statistics.c:532
msgid "unknown"
msgstr "Onbekend"
@@ -1003,3 +1051,47 @@ msgstr "Niet gespecificeert"
#: equipment.c:1514
msgid "weight"
msgstr "Gewicht"
+
+#, fuzzy
+#~ msgctxt "Depth"
+#~ msgid ""
+#~ "Depth\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Diepte\n"
+#~ "Gemiddeld"
+
+#, fuzzy
+#~ msgctxt "Duration"
+#~ msgid ""
+#~ "Duration\n"
+#~ "Total"
+#~ msgstr ""
+#~ "Duur\n"
+#~ "Totaal"
+
+#, fuzzy
+#~ msgctxt "SAC"
+#~ msgid ""
+#~ "SAC\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Gas verbruiksratio\n"
+#~ "Gemiddeld"
+
+#, fuzzy
+#~ msgid ""
+#~ "SAC|\n"
+#~ "Minimum"
+#~ msgstr ""
+#~ "\n"
+#~ "Kleinste"
+
+#, fuzzy
+#~ msgctxt "Temp"
+#~ msgid ""
+#~ "Temperature\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Temperatuur\n"
+#~ "Gemiddeld"
diff --git a/po/no_NO.po b/po/no_NO.po
index 3fcfa1c66..359ae8b34 100644
--- a/po/no_NO.po
+++ b/po/no_NO.po
@@ -1,14 +1,14 @@
-# Norwegian translations for 2.0.1 package
-# Norwegian 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.
+# Norwegian translations for Subsurface package
+# Norwegian messages for Subsurface.
+# Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Subsurface package.
# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 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-11 19:44+0100\n"
"Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
"Language-Team: Norwegian Bokmål\n"
@@ -19,66 +19,38 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: statistics.c:160
-msgid ""
-"\n"
-"Average"
-msgstr ""
-"\n"
-"Gjennomsnitt"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Longest"
-msgstr ""
-"\n"
-"Lengste"
-
-#: statistics.c:162 statistics.c:163
-msgid ""
-"\n"
-"Maximum"
-msgstr ""
-"\n"
-"Maksimum"
-
-#: statistics.c:161 statistics.c:162 statistics.c:163
-msgid ""
-"\n"
-"Minimum"
-msgstr ""
-"\n"
-"Minimum"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Shortest"
+#: statistics.c:162
+#, fuzzy
+msgctxt "Stats"
+msgid " > Month"
msgstr ""
-"\n"
-"Korteste"
+"År\n"
+" > Måned"
#: gtk-gui.c:1502
msgid " Please select dive computer and device. "
msgstr " Velg dykkecomputer og enhet"
-#: 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 %dt %dmin"
-#: statistics.c:486
+#: statistics.c:501
#, c-format
msgid "%dh %dmin"
msgstr "%dt %dmin"
@@ -120,19 +92,51 @@ msgstr "Grupper automatisk"
msgid "Automatically group dives in trips"
msgstr "Grupper dykk som turer automatisk"
-#: statistics.c:668 statistics.c:705
+#: statistics.c:168
+#, fuzzy
+msgctxt "Depth"
+msgid "Average"
+msgstr ""
+"\n"
+"Gjennomsnitt"
+
+#: statistics.c:165
+#, fuzzy
+msgctxt "Duration"
+msgid "Average"
+msgstr ""
+"\n"
+"Gjennomsnitt"
+
+#: statistics.c:171
+#, fuzzy
+msgctxt "SAC"
+msgid "Average"
+msgstr ""
+"\n"
+"Gjennomsnitt"
+
+#: statistics.c:174
+#, fuzzy
+msgctxt "Temp"
+msgid "Average"
+msgstr ""
+"\n"
+"Gjennomsnitt"
+
+#: statistics.c:683 statistics.c:720
msgid "Avg Depth"
msgstr "Snittdybde"
-#: statistics.c:676
+#: statistics.c:691
msgid "Avg SAC"
msgstr "Snitt-SAC"
-#: statistics.c:651
+#: statistics.c:666
msgid "Avg Temp"
msgstr "Snitt-temp."
-#: statistics.c:658
+#: statistics.c:673
msgid "Avg Time"
msgstr "Snitt-tid"
@@ -184,7 +188,7 @@ msgstr "Flaske"
msgid "Cylinders"
msgstr "Flasker"
-#: divelist.c:1258 print.c:154 statistics.c:696
+#: divelist.c:1258 print.c:154 statistics.c:711
msgid "Date"
msgstr "Dato"
@@ -220,18 +224,10 @@ msgstr "Slett dykk"
msgid "Delete dives"
msgstr "Slett dykk"
-#: print.c:154
+#: print.c:154 statistics.c:160
msgid "Depth"
msgstr "Dybde"
-#: statistics.c:161
-msgid ""
-"Depth\n"
-"Average"
-msgstr ""
-"Dybde\n"
-"Gjennomsnitt"
-
#: info.c:836
#, c-format
msgid "Depth (%s):"
@@ -264,7 +260,7 @@ msgstr "Dykk #%d - %s"
msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
msgstr "Dykk #%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 "Informasjon"
@@ -272,7 +268,7 @@ msgstr "Informasjon"
msgid "Dive Notes"
msgstr "Dykk"
-#: statistics.c:697
+#: statistics.c:712
msgid "Dive Time"
msgstr "Starttid"
@@ -308,7 +304,7 @@ msgstr "Skrifttype for liste"
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:648
+#: statistics.c:663
msgid "Dives"
msgstr "Dykk"
@@ -317,12 +313,9 @@ msgid "Download From Dive Computer"
msgstr "Last ned fra dykkecomputer"
#: statistics.c:160
-msgid ""
-"Duration\n"
-"Total"
-msgstr ""
-"Varighet\n"
-"Total"
+#, fuzzy
+msgid "Duration"
+msgstr "Varighet (min)"
#: info.c:831
msgid "Duration (min)"
@@ -421,7 +414,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "fre"
-#: statistics.c:715
+#: statistics.c:730
msgid "Gas Used"
msgstr "Gass brukt"
@@ -474,7 +467,15 @@ msgstr "Sted"
msgid "Log"
msgstr "Logg"
-#: statistics.c:659
+#: statistics.c:167
+#, fuzzy
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+"\n"
+"Lengste"
+
+#: statistics.c:674
msgid "Longest Dive"
msgstr "Lengste dykk"
@@ -502,15 +503,15 @@ msgstr "master"
msgid "Max Deco Time Warning"
msgstr "Advarsel: maks dekotid"
-#: statistics.c:666 statistics.c:704
+#: statistics.c:681 statistics.c:719
msgid "Max Depth"
msgstr "Maks. dybde"
-#: statistics.c:674
+#: statistics.c:689
msgid "Max SAC"
msgstr "Maks. SAC"
-#: statistics.c:649
+#: statistics.c:664
msgid "Max Temp"
msgstr "Maks. temp."
@@ -529,6 +530,30 @@ msgstr ""
msgid "MaxPress"
msgstr "Maks. trykk"
+#: statistics.c:170
+#, fuzzy
+msgctxt "Depth"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maksimum"
+
+#: statistics.c:173
+#, fuzzy
+msgctxt "SAC"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maksimum"
+
+#: statistics.c:176
+#, fuzzy
+msgctxt "Temp"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maksimum"
+
#: main.c:46
msgid "May"
msgstr "mai"
@@ -545,18 +570,42 @@ msgstr "Slå sammen tur med turen under"
msgid "Meter"
msgstr "meter"
-#: statistics.c:667
+#: statistics.c:682
msgid "Min Depth"
msgstr "Min. dybde"
-#: statistics.c:675
+#: statistics.c:690
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:650
+#: statistics.c:665
msgid "Min Temp"
msgstr "Min. temp"
+#: 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 "Ymse valg"
@@ -589,7 +638,7 @@ msgstr "Notater"
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"
@@ -625,7 +674,7 @@ msgstr "psi"
msgid "Preferences"
msgstr "Valg"
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
msgid "Pressure"
msgstr "Trykk"
@@ -698,18 +747,10 @@ msgstr "Oppdater nummerering"
msgid "Retry"
msgstr "Prøv igjen"
-#: 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 "SAC"
-#: statistics.c:162
-msgid ""
-"SAC\n"
-"Average"
-msgstr ""
-"SAC\n"
-"Gjennomsnitt"
-
#: file.c:75
msgid "SDE file"
msgstr "SDE-fil"
@@ -754,7 +795,15 @@ msgstr ""
"Fikk ikke skrevet ferdig req.txt\n"
"Er Uemis Zurich plugget i ordentlig?"
-#: statistics.c:660
+#: statistics.c:166
+#, fuzzy
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+"\n"
+"Korteste"
+
+#: statistics.c:675
msgid "Shortest Dive"
msgstr "Korteste dykk"
@@ -762,7 +811,7 @@ msgstr "Korteste dykk"
msgid "Show Columns"
msgstr "Vis kolonner"
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
msgid "Size"
msgstr "Størrelse"
@@ -778,7 +827,7 @@ msgstr "Advarsel: oppstigningshastighet"
msgid "Start"
msgstr "Start"
-#: statistics.c:640
+#: statistics.c:655
msgid "Statistics"
msgstr "Statistikk"
@@ -795,7 +844,7 @@ msgstr "Drakt"
msgid "Sun"
msgstr "søn"
-#: statistics.c:698
+#: statistics.c:713
msgid "Surf Intv"
msgstr "Overflateintervall"
@@ -815,13 +864,10 @@ msgstr "Info: trykk"
msgid "Temp"
msgstr "Temp"
-#: statistics.c:162
-msgid ""
-"Temperature\n"
-"Average"
-msgstr ""
-"Temperatur\n"
-"Gjennomsnitt"
+#: statistics.c:160
+#, fuzzy
+msgid "Temperature"
+msgstr "Temperatur:"
#: gtk-gui.c:599
msgid "Temperature:"
@@ -843,7 +889,13 @@ msgstr "Tid"
msgid "Toggle Zoom"
msgstr "Zoom av/på"
-#: statistics.c:657
+#: statistics.c:164
+#, fuzzy
+msgctxt "Duration"
+msgid "Total"
+msgstr "Total tid"
+
+#: statistics.c:672
msgid "Total Time"
msgstr "Total tid"
@@ -891,7 +943,7 @@ msgstr "Vis"
msgid "Volume:"
msgstr "Volum:"
-#: statistics.c:706
+#: statistics.c:721
msgid "Water Temp"
msgstr "Vanntemperatur"
@@ -916,14 +968,10 @@ msgid "XML file"
msgstr "XML-fil"
#: statistics.c:160
-msgid ""
-"Year\n"
-" > Month"
+msgid "Year"
msgstr ""
-"År\n"
-" > Måned"
-#: gtk-gui.c:915 statistics.c:345
+#: gtk-gui.c:915 statistics.c:360
msgid "Yearly Statistics"
msgstr "Årsstatistikk"
@@ -980,7 +1028,7 @@ msgstr "pund"
msgid "min"
msgstr "Min"
-#: statistics.c:478
+#: statistics.c:493
#, c-format
msgid "more than %d days"
msgstr "mer enn %d dager"
@@ -989,7 +1037,7 @@ msgstr "mer enn %d dager"
msgid "unkn"
msgstr "ukjent"
-#: statistics.c:517
+#: statistics.c:532
msgid "unknown"
msgstr "ukjent"
@@ -1000,3 +1048,47 @@ msgstr "ikke spesifisert"
#: equipment.c:1514
msgid "weight"
msgstr "Vekt"
+
+#, fuzzy
+#~ msgctxt "Depth"
+#~ msgid ""
+#~ "Depth\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Dybde\n"
+#~ "Gjennomsnitt"
+
+#, fuzzy
+#~ msgctxt "Duration"
+#~ msgid ""
+#~ "Duration\n"
+#~ "Total"
+#~ msgstr ""
+#~ "Varighet\n"
+#~ "Total"
+
+#, fuzzy
+#~ msgctxt "SAC"
+#~ msgid ""
+#~ "SAC\n"
+#~ "Average"
+#~ msgstr ""
+#~ "SAC\n"
+#~ "Gjennomsnitt"
+
+#, fuzzy
+#~ msgid ""
+#~ "SAC|\n"
+#~ "Minimum"
+#~ msgstr ""
+#~ "\n"
+#~ "Minimum"
+
+#, fuzzy
+#~ msgctxt "Temp"
+#~ msgid ""
+#~ "Temperature\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Temperatur\n"
+#~ "Gjennomsnitt"
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"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e15146ac7..f027e6434 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,7 +1,7 @@
-# Swedish translations for 2.0.1 package
-# Swedish 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.
+# Swedish translations for Subsurface package
+# Swedish 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 Norwegian translations by
# Henrik Brautaset Aronsen <subsurface@henrik.synth.no>, 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-12 11:48+0900\n"
"Last-Translator: Linus Torvalds <torvalds@linux-foundation.org>\n"
"Language-Team: Swedish\n"
@@ -20,72 +20,38 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: statistics.c:160
-msgid ""
-"\n"
-"Average"
-msgstr ""
-"\n"
-"Genomsnitt"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Longest"
-msgstr ""
-"\n"
-"Längsta"
-
-#: statistics.c:162
-#: statistics.c:163
-msgid ""
-"\n"
-"Maximum"
-msgstr ""
-"\n"
-"Maksimum"
-
-#: statistics.c:161
#: statistics.c:162
-#: statistics.c:163
-msgid ""
-"\n"
-"Minimum"
+#, fuzzy
+msgctxt "Stats"
+msgid " > Month"
msgstr ""
-"\n"
-"Minimum"
-
-#: statistics.c:161
-msgid ""
-"\n"
-"Shortest"
-msgstr ""
-"\n"
-"Kortaste"
+"År\n"
+" > Månad"
#: gtk-gui.c:1502
msgid " Please select dive computer and device. "
msgstr " Välj dykdator och enhet"
-#: 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 %dt %dmin"
-#: statistics.c:486
+#: statistics.c:501
#, c-format
msgid "%dh %dmin"
msgstr "%dt %dmin"
@@ -127,20 +93,51 @@ msgstr "Gruppera automatiskt"
msgid "Automatically group dives in trips"
msgstr "Gruppera dykningar som resor automatisk"
-#: statistics.c:668
-#: statistics.c:705
+#: statistics.c:168
+#, fuzzy
+msgctxt "Depth"
+msgid "Average"
+msgstr ""
+"\n"
+"Genomsnitt"
+
+#: statistics.c:165
+#, fuzzy
+msgctxt "Duration"
+msgid "Average"
+msgstr ""
+"\n"
+"Genomsnitt"
+
+#: statistics.c:171
+#, fuzzy
+msgctxt "SAC"
+msgid "Average"
+msgstr ""
+"\n"
+"Genomsnitt"
+
+#: statistics.c:174
+#, fuzzy
+msgctxt "Temp"
+msgid "Average"
+msgstr ""
+"\n"
+"Genomsnitt"
+
+#: statistics.c:683 statistics.c:720
msgid "Avg Depth"
msgstr "Medeldjup"
-#: statistics.c:676
+#: statistics.c:691
msgid "Avg SAC"
msgstr "Medel-SAC"
-#: statistics.c:651
+#: statistics.c:666
msgid "Avg Temp"
msgstr "Medel-temp."
-#: statistics.c:658
+#: statistics.c:673
msgid "Avg Time"
msgstr "Medel-tid"
@@ -148,9 +145,7 @@ msgstr "Medel-tid"
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 "Buddy"
@@ -182,13 +177,11 @@ msgstr "Ny resa innan"
msgid "CuFt"
msgstr "ft^3"
-#: divelist.c:1265
-#: gtk-gui.c:620
+#: divelist.c:1265 gtk-gui.c:620
msgid "Cyl"
msgstr "Cyl"
-#: equipment.c:926
-#: equipment.c:1062
+#: equipment.c:926 equipment.c:1062
msgid "Cylinder"
msgstr "Cylinder"
@@ -196,9 +189,7 @@ msgstr "Cylinder"
msgid "Cylinders"
msgstr "Cylindrar"
-#: divelist.c:1258
-#: print.c:154
-#: statistics.c:696
+#: divelist.c:1258 print.c:154 statistics.c:711
msgid "Date"
msgstr "Datum"
@@ -234,18 +225,10 @@ msgstr "Radera dykning"
msgid "Delete dives"
msgstr "Radera dykningar"
-#: print.c:154
+#: print.c:154 statistics.c:160
msgid "Depth"
msgstr "Djup"
-#: statistics.c:161
-msgid ""
-"Depth\n"
-"Average"
-msgstr ""
-"Djup\n"
-"Genomsnitt"
-
#: info.c:836
#, c-format
msgid "Depth (%s):"
@@ -278,9 +261,7 @@ msgstr "Dykning #%d - %s"
msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
msgstr "Dykning #%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 "Information"
@@ -288,7 +269,7 @@ msgstr "Information"
msgid "Dive Notes"
msgstr "Dykning"
-#: statistics.c:697
+#: statistics.c:712
msgid "Dive Time"
msgstr "Starttid"
@@ -324,22 +305,18 @@ msgstr "Font för dyklistan"
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:648
+#: statistics.c:663
msgid "Dives"
msgstr "Dykningar"
-#: gtk-gui.c:911
-#: gtk-gui.c:1494
+#: gtk-gui.c:911 gtk-gui.c:1494
msgid "Download From Dive Computer"
msgstr "Nedladda från dykdator"
#: statistics.c:160
-msgid ""
-"Duration\n"
-"Total"
-msgstr ""
-"Tid\n"
-"Total"
+#, fuzzy
+msgid "Duration"
+msgstr "Tid (min)"
#: info.c:831
msgid "Duration (min)"
@@ -377,13 +354,11 @@ msgstr "Redigera resesammandrag"
msgid "Enable / Disable Events"
msgstr "Aktivera / Inaktivera händelser"
-#: equipment.c:965
-#: equipment.c:1489
+#: equipment.c:965 equipment.c:1489
msgid "End"
msgstr "Slut"
-#: gtk-gui.c:1116
-#: info.c:504
+#: gtk-gui.c:1116 info.c:504
msgid "Equipment"
msgstr "Utrustning"
@@ -440,7 +415,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "fre"
-#: statistics.c:715
+#: statistics.c:730
msgid "Gas Used"
msgstr "Gasanvändning"
@@ -485,11 +460,7 @@ msgstr "Lista"
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 "Ställe"
@@ -497,7 +468,15 @@ msgstr "Ställe"
msgid "Log"
msgstr "Log"
-#: statistics.c:659
+#: statistics.c:167
+#, fuzzy
+msgctxt "Duration"
+msgid "Longest"
+msgstr ""
+"\n"
+"Längsta"
+
+#: statistics.c:674
msgid "Longest Dive"
msgstr "Längsta dykning"
@@ -525,16 +504,15 @@ msgstr "master"
msgid "Max Deco Time Warning"
msgstr "Varning: max dekotid"
-#: statistics.c:666
-#: statistics.c:704
+#: statistics.c:681 statistics.c:719
msgid "Max Depth"
msgstr "Maxdjup"
-#: statistics.c:674
+#: statistics.c:689
msgid "Max SAC"
msgstr "Max SAC"
-#: statistics.c:649
+#: statistics.c:664
msgid "Max Temp"
msgstr "Max temp"
@@ -553,6 +531,30 @@ msgstr ""
msgid "MaxPress"
msgstr "Max tryck"
+#: statistics.c:170
+#, fuzzy
+msgctxt "Depth"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maksimum"
+
+#: statistics.c:173
+#, fuzzy
+msgctxt "SAC"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maksimum"
+
+#: statistics.c:176
+#, fuzzy
+msgctxt "Temp"
+msgid "Maximum"
+msgstr ""
+"\n"
+"Maksimum"
+
#: main.c:46
msgid "May"
msgstr "mai"
@@ -569,18 +571,42 @@ msgstr "Sammanslå resa med senare resa"
msgid "Meter"
msgstr "meter"
-#: statistics.c:667
+#: statistics.c:682
msgid "Min Depth"
msgstr "Min. djup"
-#: statistics.c:675
+#: statistics.c:690
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:650
+#: statistics.c:665
msgid "Min Temp"
msgstr "Min. temp"
+#: 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 "Diverse optioner"
@@ -605,9 +631,7 @@ msgstr "Nytt startnummer"
msgid "No Tank Data"
msgstr "Ingen tankinformation"
-#: info.c:463
-#: info.c:496
-#: info.c:919
+#: info.c:463 info.c:496 info.c:919
msgid "Notes"
msgstr "Anteckningar"
@@ -615,9 +639,7 @@ msgstr "Anteckningar"
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"
@@ -649,12 +671,11 @@ msgstr "Varning: grön PO2"
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:570
-#: gtk-gui.c:913
+#: gtk-gui.c:570 gtk-gui.c:913
msgid "Preferences"
msgstr "Optioner"
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
msgid "Pressure"
msgstr "Tryck"
@@ -698,8 +719,7 @@ msgstr "Alarm: gastid"
msgid "RGT Warning"
msgstr "Varning: gastid"
-#: info.c:489
-#: info.c:916
+#: info.c:489 info.c:916
msgid "Rating"
msgstr "Värdering"
@@ -720,8 +740,7 @@ msgstr "Ta bort dykning från resa"
msgid "Remove selected dives from trip"
msgstr "Ta bort valda dykningar från resa"
-#: gtk-gui.c:802
-#: gtk-gui.c:914
+#: gtk-gui.c:802 gtk-gui.c:914
msgid "Renumber"
msgstr "Uppdatera numrering"
@@ -729,20 +748,10 @@ msgstr "Uppdatera numrering"
msgid "Retry"
msgstr "Pröva igen"
-#: 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 "SAC"
-#: statistics.c:162
-msgid ""
-"SAC\n"
-"Average"
-msgstr ""
-"SAC\n"
-"Genomsnitt"
-
#: file.c:75
msgid "SDE file"
msgstr "SDE-fil"
@@ -771,8 +780,7 @@ msgstr "Spara ändringar?"
msgid "Save File As"
msgstr "Spara fil som"
-#: gtk-gui.c:762
-#: gtk-gui.c:916
+#: gtk-gui.c:762 gtk-gui.c:916
msgid "SelectEvents"
msgstr "Välj händelser"
@@ -788,7 +796,15 @@ msgstr ""
"Kunde inte skriva filen req.txt\n"
"Är Uemis Zurich pluggad in ordentligt?"
-#: statistics.c:660
+#: statistics.c:166
+#, fuzzy
+msgctxt "Duration"
+msgid "Shortest"
+msgstr ""
+"\n"
+"Kortaste"
+
+#: statistics.c:675
msgid "Shortest Dive"
msgstr "Kortaste dykning"
@@ -796,7 +812,7 @@ msgstr "Kortaste dykning"
msgid "Show Columns"
msgstr "Visa kolumner"
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
msgid "Size"
msgstr "Storlek"
@@ -808,12 +824,11 @@ msgstr "Alarm: uppstigningshastighet"
msgid "Speed Warning"
msgstr "Varning: uppstigningshastighet"
-#: equipment.c:962
-#: equipment.c:1488
+#: equipment.c:962 equipment.c:1488
msgid "Start"
msgstr "Start"
-#: statistics.c:640
+#: statistics.c:655
msgid "Statistics"
msgstr "Statistik"
@@ -821,10 +836,7 @@ msgstr "Statistik"
msgid "Stats"
msgstr "Statistik"
-#: 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 "Dräkt"
@@ -833,7 +845,7 @@ msgstr "Dräkt"
msgid "Sun"
msgstr "sön"
-#: statistics.c:698
+#: statistics.c:713
msgid "Surf Intv"
msgstr "Ytintervall"
@@ -853,13 +865,10 @@ msgstr "Info: tryck"
msgid "Temp"
msgstr "Temp"
-#: statistics.c:162
-msgid ""
-"Temperature\n"
-"Average"
-msgstr ""
-"Temperatur\n"
-"Genomsnitt"
+#: statistics.c:160
+#, fuzzy
+msgid "Temperature"
+msgstr "Temperatur:"
#: gtk-gui.c:599
msgid "Temperature:"
@@ -873,8 +882,7 @@ msgstr "Alla"
msgid "Thu"
msgstr "tor"
-#: info.c:791
-#: print.c:154
+#: info.c:791 print.c:154
msgid "Time"
msgstr "Tid"
@@ -882,7 +890,13 @@ msgstr "Tid"
msgid "Toggle Zoom"
msgstr "Zoom av/på"
-#: statistics.c:657
+#: statistics.c:164
+#, fuzzy
+msgctxt "Duration"
+msgid "Total"
+msgstr "Total tid"
+
+#: statistics.c:672
msgid "Total Time"
msgstr "Total tid"
@@ -890,8 +904,7 @@ msgstr "Total tid"
msgid "Tue"
msgstr "tis"
-#: equipment.c:1485
-#: equipment.c:1513
+#: equipment.c:1485 equipment.c:1513
msgid "Type"
msgstr "Typ"
@@ -931,7 +944,7 @@ msgstr "Visa"
msgid "Volume:"
msgstr "Volum:"
-#: statistics.c:706
+#: statistics.c:721
msgid "Water Temp"
msgstr "Vattentemperatur"
@@ -939,9 +952,7 @@ msgstr "Vattentemperatur"
msgid "Wed"
msgstr "ons"
-#: equipment.c:1012
-#: equipment.c:1609
-#: gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
msgid "Weight"
msgstr "Vikt"
@@ -958,15 +969,10 @@ msgid "XML file"
msgstr "XML-fil"
#: statistics.c:160
-msgid ""
-"Year\n"
-" > Month"
+msgid "Year"
msgstr ""
-"År\n"
-" > Månad"
-#: gtk-gui.c:915
-#: statistics.c:345
+#: gtk-gui.c:915 statistics.c:360
msgid "Yearly Statistics"
msgstr "Årsstatistik"
@@ -1015,8 +1021,7 @@ msgstr "integrerat"
msgid "kg"
msgstr "kg"
-#: divelist.c:1263
-#: gtk-gui.c:606
+#: divelist.c:1263 gtk-gui.c:606
msgid "lbs"
msgstr "pund"
@@ -1024,17 +1029,16 @@ msgstr "pund"
msgid "min"
msgstr "Min"
-#: statistics.c:478
+#: statistics.c:493
#, c-format
msgid "more than %d days"
msgstr "mer än %d dagar"
-#: equipment.c:1378
-#: equipment.c:1398
+#: equipment.c:1378 equipment.c:1398
msgid "unkn"
msgstr "okänd"
-#: statistics.c:517
+#: statistics.c:532
msgid "unknown"
msgstr "okänd"
@@ -1046,3 +1050,46 @@ msgstr "inte specifierad"
msgid "weight"
msgstr "Vikt"
+#, fuzzy
+#~ msgctxt "Depth"
+#~ msgid ""
+#~ "Depth\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Djup\n"
+#~ "Genomsnitt"
+
+#, fuzzy
+#~ msgctxt "Duration"
+#~ msgid ""
+#~ "Duration\n"
+#~ "Total"
+#~ msgstr ""
+#~ "Tid\n"
+#~ "Total"
+
+#, fuzzy
+#~ msgctxt "SAC"
+#~ msgid ""
+#~ "SAC\n"
+#~ "Average"
+#~ msgstr ""
+#~ "SAC\n"
+#~ "Genomsnitt"
+
+#, fuzzy
+#~ msgid ""
+#~ "SAC|\n"
+#~ "Minimum"
+#~ msgstr ""
+#~ "\n"
+#~ "Minimum"
+
+#, fuzzy
+#~ msgctxt "Temp"
+#~ msgid ""
+#~ "Temperature\n"
+#~ "Average"
+#~ msgstr ""
+#~ "Temperatur\n"
+#~ "Genomsnitt"
diff --git a/statistics.c b/statistics.c
index 06aeb2c57..fe379505b 100644
--- a/statistics.c
+++ b/statistics.c
@@ -156,16 +156,31 @@ static void init_tree()
pango_font_description_free(font_desc);
renderer = gtk_cell_renderer_text_new ();
- char *columns[] = {
- N_("Year\n > Month"), "#", N_("Duration\nTotal"), N_("\nAverage"),
- N_("\nShortest"), N_("\nLongest"), N_("Depth\nAverage"), N_("\nMinimum"),
- N_("\nMaximum"), N_("SAC\nAverage"), N_("\nMinimum"), N_("\nMaximum"), N_("Temperature\nAverage"),
- N_("\nMinimum"), N_("\nMaximum") };
+ /* don't use empty strings "" - they confuse gettext */
+ char *columnstop[] = { N_("Year"), N_("#"), N_("Duration"), " ", " ", " ", N_("Depth"), " ", " ", N_("SAC"), " ", " ", N_("Temperature"), " ", " " };
+ const char *columnsbot[15];
+ columnsbot[0] = C_("Stats", " > Month");
+ columnsbot[1] = " ";
+ columnsbot[2] = C_("Duration","Total");
+ columnsbot[3] = C_("Duration","Average");
+ columnsbot[4] = C_("Duration","Shortest");
+ columnsbot[5] = C_("Duration","Longest");
+ columnsbot[6] = C_("Depth", "Average");
+ columnsbot[7] = C_("Depth","Minimum");
+ columnsbot[8] = C_("Depth","Maximum");
+ columnsbot[9] = C_("SAC","Average");
+ columnsbot[10]= C_("SAC","Minimum");
+ columnsbot[11]= C_("SAC","Maximum");
+ columnsbot[12]= C_("Temp","Average");
+ columnsbot[13]= C_("Temp","Minimum");
+ columnsbot[14]= C_("Temp","Maximum");
/* Add all the columns to the tree view */
for (i = 0; i < N_COLUMNS; ++i) {
+ char buf[80];
column = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title(column, _(columns[i]));
+ snprintf(buf, sizeof(buf), "%s\n%s", _(columnstop[i]), columnsbot[i]);
+ gtk_tree_view_column_set_title(column, buf);
gtk_tree_view_append_column(GTK_TREE_VIEW(yearly_tree), column);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_column_pack_start(column, renderer, TRUE);