summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--divelist.c11
-rw-r--r--info.c3
-rw-r--r--po/bg_BG.po329
-rw-r--r--po/de_CH.po421
-rw-r--r--po/de_DE.po351
-rw-r--r--po/es_ES.po343
-rw-r--r--po/fi_FI.po329
-rw-r--r--po/fr_FR.po329
-rw-r--r--po/hr_HR.po329
-rw-r--r--po/nb_NO.po329
-rw-r--r--po/nl_NL.po329
-rw-r--r--po/sk_SK.po392
-rw-r--r--po/sv_SE.po329
-rw-r--r--print.c6
-rw-r--r--statistics.c3
15 files changed, 2060 insertions, 1773 deletions
diff --git a/divelist.c b/divelist.c
index 1ded3f9d2..d78f3d6fa 100644
--- a/divelist.c
+++ b/divelist.c
@@ -363,7 +363,7 @@ static void date_data_func(GtkTreeViewColumn *col,
int idx, nr;
struct tm tm;
timestamp_t when;
- char buffer[40];
+ char buffer[60];
gtk_tree_model_get(model, iter, DIVE_INDEX, &idx, DIVE_DATE, &when, -1);
nr = gtk_tree_model_iter_n_children(model, iter);
@@ -371,14 +371,17 @@ static void date_data_func(GtkTreeViewColumn *col,
utc_mkdate(when, &tm);
if (idx < 0) {
snprintf(buffer, sizeof(buffer),
- "Trip %s, %s %d, %d (%d dive%s)",
+ /*++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives */
+ ngettext("Trip %1$s, %2$s %3$d, %4$d (%5$d dive)",
+ "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)", nr),
weekday(tm.tm_wday),
monthname(tm.tm_mon),
tm.tm_mday, tm.tm_year + 1900,
- nr, nr > 1 ? "s" : "");
+ nr);
} else {
snprintf(buffer, sizeof(buffer),
- "%s, %s %d, %d %02d:%02d",
+ /*++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min */
+ _("%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"),
weekday(tm.tm_wday),
monthname(tm.tm_mon),
tm.tm_mday, tm.tm_year + 1900,
diff --git a/info.c b/info.c
index 8437c7318..b72b33398 100644
--- a/info.c
+++ b/info.c
@@ -103,7 +103,8 @@ static int divename(char *buf, size_t size, struct dive *dive)
struct tm tm;
utc_mkdate(dive->when, &tm);
- return snprintf(buf, size, _("Dive #%d - %s %02d/%02d/%04d at %d:%02d"),
+ /*++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min */
+ return snprintf(buf, size, _("Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"),
dive->number,
weekday(tm.tm_wday),
tm.tm_mon+1, tm.tm_mday,
diff --git a/po/bg_BG.po b/po/bg_BG.po
index b0d6f2e0d..0687eb27c 100644
--- a/po/bg_BG.po
+++ b/po/bg_BG.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-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"
@@ -24,7 +24,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Месец"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr " Моля изберете леководолазен компютър и устройство. "
@@ -32,22 +32,46 @@ msgstr " Моля изберете леководолазен компютър
msgid "#"
msgstr "№"
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/мин"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Гмуркане #%d - %s %02d/%02d/%04d в %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d мин"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dд %dч %dмин"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dч %dмин"
@@ -57,19 +81,19 @@ msgstr "%dч %dмин"
msgid "(%s) or (%s)"
msgstr "(%s) или (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "Информация"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Добави Гмуркане"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Добави гмуркане"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Добави в горно пътуване"
@@ -81,11 +105,11 @@ msgstr "Апр"
msgid "Aug"
msgstr "Авг"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Автоматично групиране"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Автоматично групиране на гмуркания в пътувания"
@@ -109,60 +133,60 @@ msgctxt "Temp"
msgid "Average"
msgstr "Средно"
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Средна Дълбочина"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Средно ППК"
# ППК = Повърхностно Потребление на Кислород
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Средна Темп."
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Средно Време"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "Бара"
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Партньор"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Целзии"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Моля Изберете XML Файл По Подразбиране"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Моля Изберете XML Файлове За Вмъкване"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Затвори"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Свиване на всички"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Създай ново пътуване"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "Кб.Фута"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Бут."
@@ -174,15 +198,15 @@ msgstr "Бутилка"
msgid "Cylinders"
msgstr "Бутилки"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Дата"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Дата и Час"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Дата:"
@@ -190,31 +214,31 @@ msgstr "Дата:"
msgid "Dec"
msgstr "Дек"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "XML Файл По Подразибране"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Изтрий"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Изтрий Гмуркане"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Изтрий гмуркане"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Изтрий гмуркания"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Дълбочина"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Дълбочина (%s):"
@@ -223,38 +247,39 @@ msgstr "Дълбочина (%s):"
msgid "Depth Limit Exceeded"
msgstr "Надминат Лимит На Дълбочина"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Дълбочина:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Име на устройство"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Гмуркане #%d - %s %02d/%02d/%04d в %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Гмуркане #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Гмуркане #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Информация"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Бележки"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Време"
@@ -266,35 +291,35 @@ msgstr "Тревога: Време за Гмуркане"
msgid "Dive Time Info"
msgstr "Времева Информация за Гмуркане"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Леководолазен Компютър"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Информяция за гмуркане"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Водач"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Гмуркане №"
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Шрифт за Списъка на Гмуркания"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Водач"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Гмуркания"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Изтегли от Леководолазен Компютър"
@@ -302,39 +327,39 @@ msgstr "Изтегли от Леководолазен Компютър"
msgid "Duration"
msgstr "Продълж. (мин.)"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Продълж. (мин.)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Редактирай"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Редактиране на информация за пътуване"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Редактиране на обобщение за пътуване"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Редактиране на гмуркане"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Редактирай гмуркания"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Редактиране на гмуркания"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Редактиране на обобщение за пътуване"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Включване / Изключване на Събития"
@@ -342,15 +367,15 @@ msgstr "Включване / Изключване на Събития"
msgid "End"
msgstr "Край"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Екипировка"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Разшири всички"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Фаренхайт"
@@ -359,12 +384,12 @@ msgstr "Фаренхайт"
msgid "Failed to open %i files."
msgstr "Немогат да бъдат отворени %i файла"
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Не може да бъде напревен разбор на '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Не може да бъде напревен разбор на '%s'.\n"
@@ -383,15 +408,15 @@ msgstr "Неможе да бъде прочетен '%s'.\n"
msgid "Feb"
msgstr "Фев"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "Фута"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Файл"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Филтър"
@@ -399,7 +424,7 @@ msgstr "Филтър"
msgid "Fri"
msgstr "Пет"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Използван Газ"
@@ -407,15 +432,15 @@ msgstr "Използван Газ"
msgid "Gasmix"
msgstr "Газ Микс"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Помощ"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Вмъкване на XML файл(ове)"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Информация"
@@ -432,23 +457,23 @@ msgstr "Юли"
msgid "Jun"
msgstr "Юни"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Линус Торвалдс, Дирк Хондел и други, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Списък"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "Литра"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Местоположение"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Регистър"
@@ -457,7 +482,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Най-дълго"
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Най-дълго Гмуркане"
@@ -477,7 +502,7 @@ msgstr "Март"
msgid "Marker"
msgstr "Маркер"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "Главен"
@@ -485,19 +510,19 @@ msgstr "Главен"
msgid "Max Deco Time Warning"
msgstr "Внимание: Максимално Време на Сигнал за Декомпресия"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Макс. Дълбочина"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Макс. ППК"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Макс. Темп."
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -531,27 +556,27 @@ msgstr "Максимум"
msgid "May"
msgstr "Май"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Слей пътуване с горно пътуване"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Слей пътуване с долно пътуване"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "Метра"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Мин. Дълбочина"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Мин. ППК"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Мин. Темп."
@@ -570,7 +595,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Минимум"
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Общи Настройки"
@@ -578,15 +603,15 @@ msgstr "Общи Настройки"
msgid "Mon"
msgstr "Пон"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Мултиплатформен, гмуркачески регистър-софтуер написан на C"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Нов"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Нов стартов номер"
@@ -594,7 +619,7 @@ msgstr "Нов стартов номер"
msgid "No Tank Data"
msgstr "Няма Информация за Резервоар"
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Бележки"
@@ -603,7 +628,7 @@ msgid "Nov"
msgstr "Нов"
# АЗПК = Апарат за Поносимост на Кислород
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "АЗПК"
@@ -611,11 +636,11 @@ msgstr "АЗПК"
msgid "Oct"
msgstr "Окт"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Отвори"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Отвори Файл"
@@ -631,11 +656,11 @@ msgstr "Внимание: Покачване на Парциално О2 Нал
msgid "PO2 Green Warning"
msgstr "Внимание: Парциално О2 Налягане в Зелената Зона"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Настройки"
@@ -643,35 +668,35 @@ msgstr "Настройки"
msgid "Pressure"
msgstr "Налягане"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Налягане:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Красив печат"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Напечатай"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Напечатай само избраните гмуркания"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Напечатай селекцията"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Тип на печата"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Профил"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Изход"
@@ -683,7 +708,7 @@ msgstr "Тревога: Оставащо Газ-Време"
msgid "RGT Warning"
msgstr "Внимание: Оставащо Газ-Време"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Оценка"
@@ -692,27 +717,27 @@ msgstr "Оценка"
msgid "Reading dive %s"
msgstr "Четене на гмуркане %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Изтрий Пътуване"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Изтрий гмуркане от пътуване"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
msgstr "Изтрий избраните гмуркания от пътуване"
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Преномерирай"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Опитай пак"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "ППК"
@@ -728,11 +753,11 @@ msgstr "Нарушение на Безопасно Спиране"
msgid "Sat"
msgstr "Съб"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Запиши"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Запиши като"
@@ -744,7 +769,7 @@ msgstr "Запиши Промените?"
msgid "Save File As"
msgstr "Запиши Файл Като?"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Избери Събития"
@@ -765,11 +790,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Най-къс"
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Най-кратко Гмуркане"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Покажи Колони"
@@ -789,15 +814,15 @@ msgstr "Внимание: Скорост"
msgid "Start"
msgstr "Старт"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Статистика"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Статистики"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Водолазен Костюм"
@@ -806,11 +831,11 @@ msgstr "Водолазен Костюм"
msgid "Sun"
msgstr "Нед"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Време на Повърхността"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Печат на таблица"
@@ -822,7 +847,7 @@ msgstr "Предложение за Смяна на Резорвоар"
msgid "Tank Pressure Info"
msgstr "Информация: Налагане на Резервоар"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Температура"
@@ -830,11 +855,11 @@ msgstr "Температура"
msgid "Temperature"
msgstr "Температура:"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Температура:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Комбиниран"
@@ -842,11 +867,11 @@ msgstr "Комбиниран"
msgid "Thu"
msgstr "Чет"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Време"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Превключване на Зуум"
@@ -855,10 +880,18 @@ msgctxt "Duration"
msgid "Total"
msgstr "Общо Време"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Общо Време"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
#: main.c:37
msgid "Tue"
msgstr "Вт"
@@ -891,19 +924,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Uemis не може да бъде зареден"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Единици"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Изглед"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Обем:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Темп. на Водата"
@@ -911,7 +944,7 @@ msgstr "Темп. на Водата"
msgid "Wed"
msgstr "Ср"
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
msgid "Weight"
msgstr "Тежест"
@@ -919,7 +952,7 @@ msgstr "Тежест"
msgid "Weight System"
msgstr "Система за тежест"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Тегло:"
@@ -931,7 +964,7 @@ msgstr "XML файл"
msgid "Year"
msgstr "Година"
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Годишни статистики"
@@ -943,7 +976,7 @@ msgstr ""
"Имате незаписани промени.\n"
"Желаете ли да ги запишете преди затваряне на файла?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -968,7 +1001,7 @@ msgstr "колан"
msgid "clip-on"
msgstr "щипка"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "фута"
@@ -976,19 +1009,19 @@ msgstr "фута"
msgid "integrated"
msgstr "вградена"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "кг"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "паунда"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "мин"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "повече от %d дни"
@@ -997,7 +1030,7 @@ msgstr "повече от %d дни"
msgid "unkn"
msgstr "неизв."
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "неизвестно"
diff --git a/po/de_CH.po b/po/de_CH.po
index 76dad4d3a..c4a0e525b 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-10-15 14:02+0100\n"
"Last-Translator: Martin Gysel <me@bearsh.org>\n"
"Language-Team: German\n"
@@ -23,7 +23,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Monat"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr " Bitte Tauchcomputer und Gerät auswählen. "
@@ -31,25 +31,46 @@ msgstr " Bitte Tauchcomputer und Gerät auswählen. "
msgid "#"
msgstr "#"
-#: statistics.c:616
-#: statistics.c:618
-#: statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252
-#: statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr "%1$s%2$s %4$d. %3$s %5$d %6$d:%7$02d"
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr "%1$s %3$d. %2$s %4$d %5$dh%6$02d"
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
@@ -59,21 +80,21 @@ msgstr "%dst %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) oder (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "Info"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Tauchgang hinzufügen"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Tauchgang hinzufügen"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
-msgstr "Zur obigen Gruppe hinzufügen"
+msgstr "Zur obigen Reise hinzufügen"
#: main.c:46
msgid "Apr"
@@ -83,11 +104,11 @@ msgstr "Apr"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Automatisch gruppieren"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Automatisch die Tauchgänge gruppieren"
@@ -111,68 +132,65 @@ msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:683
-#: statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Durchschn. Tiefe"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Ø SAC"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Durchschn. Temp"
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Duchschn. Dauer"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "bar"
-#: info.c:484
-#: info.c:911
-#: print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Partner"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Standard XML Datei auswählen"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
-msgstr "Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werden sollen"
+msgstr ""
+"Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werden "
+"sollen"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Schliessen"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Alle einfalten"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
-msgstr "Neuen Gruppe darüber einfügen"
+msgstr "Neue Reise darüber einfügen"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1265
-#: gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Tank"
-#: equipment.c:926
-#: equipment.c:1062
+#: equipment.c:926 equipment.c:1062
msgid "Cylinder"
msgstr "Tank"
@@ -180,17 +198,15 @@ msgstr "Tank"
msgid "Cylinders"
msgstr "Tanks"
-#: divelist.c:1258
-#: print.c:154
-#: statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Datum"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Datum und Zeit"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Datum:"
@@ -198,32 +214,31 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Dez"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Standard XML Datei"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Löschen"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Tauchgang löschen"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Tauchgang löschen"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Tauchgänge löschen"
-#: print.c:154
-#: statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Tiefe"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Tiefe (%s):"
@@ -232,42 +247,41 @@ msgstr "Tiefe (%s):"
msgid "Depth Limit Exceeded"
msgstr "Tiefenlimit überschritten"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Tiefe:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Gerätename"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Tauchgang #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Tauchgang #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Informationen"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Notizen"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
-msgstr "Startzeit"
+msgstr "Dauer"
#: uemis.c:162
msgid "Dive Time Alert"
@@ -277,36 +291,35 @@ msgstr "Alarm: Tauchgangsdauer"
msgid "Dive Time Info"
msgstr "Info: Tauchgangsdauer"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Tauchcomputer"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Notizen zum Tauchgang"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Dive guide"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Tauchgang Nr."
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Schriftart für Tauchliste"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Diveguide"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Tauchgänge"
-#: gtk-gui.c:911
-#: gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Vom Tauchcomputer runterladen"
@@ -314,57 +327,55 @@ msgstr "Vom Tauchcomputer runterladen"
msgid "Duration"
msgstr "Dauer"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Dauer (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Bearbeiten"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
-msgstr "Gruppen-Informationen bearbeiten"
+msgstr "Reisen-Informationen bearbeiten"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
-msgstr "Gruppen-Übersicht bearbeiten"
+msgstr "Reisen-Übersicht bearbeiten"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Tauchgang bearbeiten"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Tauchgänge bearbeiten"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Mehrere Tauchgänge bearbeiten"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
-msgstr "Gruppen-Übersicht bearbeiten"
+msgstr "Reisen-Übersicht bearbeiten"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Ereignisse Ein-/Ausblenden"
-#: equipment.c:965
-#: equipment.c:1489
+#: equipment.c:965 equipment.c:1489
msgid "End"
msgstr "Ende"
-#: gtk-gui.c:1116
-#: info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Ausrüstung"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Alle ausfalten"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -373,12 +384,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "Fehler beim Öffnen von %i Dateien."
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Fehler beim Analysieren von '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Fehler beim Analysieren von '%s'.\n"
@@ -397,15 +408,15 @@ msgstr "Fehler beim Lesen von '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "Fuss"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Datei"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Filter"
@@ -413,7 +424,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "Fr"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Gasverbrauch"
@@ -421,15 +432,15 @@ msgstr "Gasverbrauch"
msgid "Gasmix"
msgstr "Gasmischung"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Hilfe"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "XML Datei(en) einlesen"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Informationen"
@@ -446,27 +457,23 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "Liter"
-#: divelist.c:1269
-#: info.c:458
-#: info.c:478
-#: info.c:905
-#: print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Ort"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Log"
@@ -475,7 +482,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Max."
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Längster Tauchgang"
@@ -495,7 +502,7 @@ msgstr "Mär"
msgid "Marker"
msgstr "Markierung"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "Guide"
@@ -503,20 +510,19 @@ msgstr "Guide"
msgid "Max Deco Time Warning"
msgstr "Warnung: Maximale Deco Zeit"
-#: statistics.c:681
-#: statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Max. Tiefe"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Max. AMV"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -550,27 +556,27 @@ msgstr "Max."
msgid "May"
msgstr "Mai"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
-msgstr "Gruppe mit der darüber verbinden"
+msgstr "Reise mit der darüber verbinden"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
-msgstr "Gruppe mit der darunter verbinden"
+msgstr "Reise mit der darunter verbinden"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "Meter"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Min. Tiefe"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Min. Temp."
@@ -589,7 +595,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Verschiedene Optionen"
@@ -597,15 +603,15 @@ msgstr "Verschiedene Optionen"
msgid "Mon"
msgstr "Mo"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Multi-Platform Tauchprogram in C"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Neu"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Neue erste Nummer"
@@ -613,9 +619,7 @@ msgstr "Neue erste Nummer"
msgid "No Tank Data"
msgstr "Keine Tank Informationen"
-#: info.c:463
-#: info.c:496
-#: info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Notizen"
@@ -623,9 +627,7 @@ msgstr "Notizen"
msgid "Nov"
msgstr "Nov"
-#: divelist.c:1268
-#: gtk-gui.c:635
-#: statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "OTU"
@@ -633,11 +635,11 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Öffnen"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Datei öffnen"
@@ -653,49 +655,47 @@ msgstr "Warnung: Aufstieg / PO2"
msgid "PO2 Green Warning"
msgstr "Warnung: PO2 Grün"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:570
-#: gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Einstellungen"
-#: equipment.c:954
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
msgid "Pressure"
msgstr "Druck"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Druck:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Schön drucken"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Drucken"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Nur ausgewählte Tauchgänge drucken"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Auswahl drucken"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Art des Ausdrucks"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Beenden"
@@ -707,8 +707,7 @@ msgstr "Alarm: verbleibende Gas-Zeit"
msgid "RGT Warning"
msgstr "Warnung: verbleibende Gas-Zeit"
-#: info.c:489
-#: info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Bewertung"
@@ -717,31 +716,27 @@ msgstr "Bewertung"
msgid "Reading dive %s"
msgstr "Lese Tauchgang %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
-msgstr "Gruppe entfernen"
+msgstr "Reise entfernen"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
-msgstr "Tauchgang aus Gruppe entfernen"
+msgstr "Tauchgang aus Reise entfernen"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
-msgstr "Ausgewählte Tauchgänge aus Gruppe entfernen"
+msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
-#: gtk-gui.c:802
-#: gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Neu nummerieren"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Wiederholen"
-#: divelist.c:1267
-#: gtk-gui.c:630
-#: statistics.c:160
-#: statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "AMV"
@@ -757,11 +752,11 @@ msgstr "Verletzung des Sicherheitsstops"
msgid "Sat"
msgstr "Sa"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Speichern"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Speichern unter"
@@ -773,8 +768,7 @@ msgstr "Änderungen speichern?"
msgid "Save File As"
msgstr "Datei speichern unter"
-#: gtk-gui.c:762
-#: gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Ereignisse auswählen"
@@ -795,16 +789,15 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Kürzester Tauchgang"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Spalten anzeigen"
-#: equipment.c:951
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
msgid "Size"
msgstr "Grösse"
@@ -816,23 +809,19 @@ msgstr "Alarm: Geschwindigkeit"
msgid "Speed Warning"
msgstr "Warnung: Geschwindigkeit"
-#: equipment.c:962
-#: equipment.c:1488
+#: equipment.c:962 equipment.c:1488
msgid "Start"
msgstr "Start"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Statistiken"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Statistiken"
-#: divelist.c:1264
-#: gtk-gui.c:645
-#: info.c:490
-#: info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Anzug"
@@ -841,11 +830,11 @@ msgstr "Anzug"
msgid "Sun"
msgstr "So"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Oberflächenpause"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Tabellenausdruck"
@@ -857,7 +846,7 @@ msgstr "Tankwechsel Vorschlag"
msgid "Tank Pressure Info"
msgstr "Info: Tankdruck"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Temperatur"
@@ -865,11 +854,11 @@ msgstr "Temperatur"
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Temperatur:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Drei"
@@ -877,12 +866,11 @@ msgstr "Drei"
msgid "Thu"
msgstr "Do"
-#: info.c:791
-#: print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Zeit"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Zoom ein-/ausschalten"
@@ -891,16 +879,23 @@ msgctxt "Duration"
msgid "Total"
msgstr "Gesamt"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Gesamtzeit"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgang)"
+msgstr[1] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)"
+
#: main.c:37
msgid "Tue"
msgstr "Di"
-#: equipment.c:1485
-#: equipment.c:1513
+#: equipment.c:1485 equipment.c:1513
msgid "Type"
msgstr "Typ"
@@ -928,19 +923,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Uemis Initialisierung fehlgeschlagen"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Einheiten"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Ansicht"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Volumen:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Wassertemperatur"
@@ -948,9 +943,7 @@ msgstr "Wassertemperatur"
msgid "Wed"
msgstr "Mi"
-#: equipment.c:1012
-#: equipment.c:1609
-#: gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
msgid "Weight"
msgstr "Gewicht"
@@ -958,7 +951,7 @@ msgstr "Gewicht"
msgid "Weight System"
msgstr "Gewicht"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Gewicht:"
@@ -970,8 +963,7 @@ msgstr "XML Datei"
msgid "Year"
msgstr "Jahr"
-#: gtk-gui.c:915
-#: statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Jährliche Statistiken"
@@ -983,7 +975,7 @@ msgstr ""
"Nicht alle Änderungen wurden gespeichert.\n"
"Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1008,7 +1000,7 @@ msgstr "Gürtel"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -1016,30 +1008,28 @@ msgstr "ft"
msgid "integrated"
msgstr "integriert"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263
-#: gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "US Pfund"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "mehr als %d Tage"
-#: equipment.c:1378
-#: equipment.c:1398
+#: equipment.c:1378 equipment.c:1398
msgid "unkn"
msgstr "unbk"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "unbekannt"
@@ -1052,23 +1042,22 @@ msgid "weight"
msgstr "Gewicht"
#~ msgctxt "Depth"
-
#~ msgid ""
#~ "Depth\n"
#~ "Average"
#~ msgstr ""
#~ "Tiefe\n"
#~ "Ø"
-#~ msgctxt "Duration"
+#~ msgctxt "Duration"
#~ msgid ""
#~ "Duration\n"
#~ "Total"
#~ msgstr ""
#~ "Dauer\n"
#~ "Gesamt"
-#~ msgctxt "SAC"
+#~ msgctxt "SAC"
#~ msgid ""
#~ "SAC\n"
#~ "Average"
@@ -1083,8 +1072,8 @@ msgstr "Gewicht"
#~ msgstr ""
#~ "\n"
#~ "Min."
-#~ msgctxt "Temp"
+#~ msgctxt "Temp"
#~ msgid ""
#~ "Temperature\n"
#~ "Average"
diff --git a/po/de_DE.po b/po/de_DE.po
index e4a9a414a..55af64706 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-10-10 16:27+0900\n"
"Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
"Language-Team: German\n"
@@ -23,7 +23,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Monat"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr " Bitte Tauchcomputer und Gerät auswählen. "
@@ -31,22 +31,46 @@ msgstr " Bitte Tauchcomputer und Gerät auswählen. "
msgid "#"
msgstr ""
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr "%1$s%2$s %4$d. %3$s %5$d %6$d:%7$02d"
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr "%1$s %3$d. %2$s %4$d %5$dh%6$02d"
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
@@ -56,21 +80,21 @@ msgstr "%dst %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) oder (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "Info"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Tauchgang hinzufügen"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Tauchgang hinzufügen"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
-msgstr "Zur obigen Gruppe hinzufügen"
+msgstr "Zur obigen Reise hinzufügen"
#: main.c:46
msgid "Apr"
@@ -80,11 +104,11 @@ msgstr "Apr"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Automatisch gruppieren"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Automatisch die Tauchgänge gruppieren"
@@ -108,61 +132,61 @@ msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Ø Tiefe"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Ø AMV"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Ø Temp"
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Ø Dauer"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "bar"
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Partner"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Standard XML Datei auswählen"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr ""
"Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werden "
"sollen"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Schließen"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Alle einfalten"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
-msgstr "Neuen Gruppe darüber einfügen"
+msgstr "Neue Reise darüber einfügen"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Tank"
@@ -174,15 +198,15 @@ msgstr "Tank"
msgid "Cylinders"
msgstr "Tanks"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Datum"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Datum und Zeit"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Datum:"
@@ -190,31 +214,31 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Dez"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Standard XML Datei"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Löschen"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Tauchgang löschen"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Tauchgang löschen"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Tauchgänge löschen"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Tiefe"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Tiefe (%s):"
@@ -223,40 +247,41 @@ msgstr "Tiefe (%s):"
msgid "Depth Limit Exceeded"
msgstr "Tiefenbegrenzung überschritten"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Tiefe:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Gerätename"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Tauchgang #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Tauchgang #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Informationen"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Notizen"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
-msgstr "Startzeit"
+msgstr "Dauer"
#: uemis.c:162
msgid "Dive Time Alert"
@@ -266,35 +291,35 @@ msgstr "Alarm: Tauchgangsdauer"
msgid "Dive Time Info"
msgstr "Info: Tauchgangsdauer"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Tauchcomputer"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Notizen zum Tauchgang"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Tauchgruppenleiter"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Tauchgang Nr."
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Schriftart für Tauchliste"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Tauchgruppenleiter"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Tauchgänge"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Vom Tauchcomputer runterladen"
@@ -302,39 +327,39 @@ msgstr "Vom Tauchcomputer runterladen"
msgid "Duration"
msgstr "Dauer"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Dauer (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Bearbeiten"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
-msgstr "Gruppen-Informationen bearbeiten"
+msgstr "Reisen-Informationen bearbeiten"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
-msgstr "Gruppen-Übersicht bearbeiten"
+msgstr "Reisen-Übersicht bearbeiten"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Tauchgang bearbeiten"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Tauchgänge bearbeiten"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Mehrere Tauchgänge bearbeiten"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
-msgstr "Gruppen-Übersicht bearbeiten"
+msgstr "Reisen-Übersicht bearbeiten"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Ereignisse Ein-/Ausblenden"
@@ -342,15 +367,15 @@ msgstr "Ereignisse Ein-/Ausblenden"
msgid "End"
msgstr "Ende"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Ausrüstung"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Alle ausfalten"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -359,12 +384,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "Fehler beim Öffnen von %i Dateien"
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Fehler beim Analysieren von '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Fehler beim Analysieren von '%s'.\n"
@@ -383,15 +408,15 @@ msgstr "Fehler beim Lesen von '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "Fuß"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Datei"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Filter"
@@ -399,7 +424,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "Fr"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Gasverbrauch"
@@ -407,15 +432,15 @@ msgstr "Gasverbrauch"
msgid "Gasmix"
msgstr "Gasmischung"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Hilfe"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "XML Datei(en) einlesen"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Informatinen"
@@ -432,23 +457,23 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "Liter"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Ort"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Log"
@@ -457,7 +482,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Max."
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Längster Tauchgang"
@@ -477,7 +502,7 @@ msgstr "Mär"
msgid "Marker"
msgstr "Markierung"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "Leiter"
@@ -485,19 +510,19 @@ msgstr "Leiter"
msgid "Max Deco Time Warning"
msgstr "Warnung: Maximale Deco Zeit"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Max. Tiefe"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Max. AMV"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -531,27 +556,27 @@ msgstr "Max."
msgid "May"
msgstr "Mai"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
-msgstr "Gruppe mit der darüber verbinden"
+msgstr "Reise mit der darüber verbinden"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
-msgstr "Gruppe mit der darunter verbinden"
+msgstr "Reise mit der darunter verbinden"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "Meter"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Min. Tiefe"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Min. AMV"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Min. Temp."
@@ -570,7 +595,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Verschiedene Optionen"
@@ -578,15 +603,15 @@ msgstr "Verschiedene Optionen"
msgid "Mon"
msgstr "Mo"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Multi-Platform Tauchprogram in C"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Neu"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Neue erste Nummer"
@@ -594,7 +619,7 @@ msgstr "Neue erste Nummer"
msgid "No Tank Data"
msgstr "Keine Tank Informationen"
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Notizen"
@@ -602,7 +627,7 @@ msgstr "Notizen"
msgid "Nov"
msgstr "Nov"
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "OTU"
@@ -610,11 +635,11 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Öffnen"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Datei öffnen"
@@ -630,11 +655,11 @@ msgstr "Warnung: Aufstieg / PO2"
msgid "PO2 Green Warning"
msgstr "Warnung: PO2 Grün"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Einstellungen"
@@ -642,35 +667,35 @@ msgstr "Einstellungen"
msgid "Pressure"
msgstr "Druck"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Druck:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Schön drucken"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Drucken"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Nur ausgewählte Tauchgänge drucken"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Auswahl drucken"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Art des Ausdrucks"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Beenden"
@@ -682,7 +707,7 @@ msgstr "Alarm: verbleibende Gas-Zeit"
msgid "RGT Warning"
msgstr "Warnung: verbleibende Gas-Zeit"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Bewertung"
@@ -691,27 +716,27 @@ msgstr "Bewertung"
msgid "Reading dive %s"
msgstr "Lese Tauchgang %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
-msgstr "Gruppe entfernen"
+msgstr "Reise entfernen"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
-msgstr "Tauchgang aus Gruppe entfernen"
+msgstr "Tauchgang aus Reise entfernen"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
-msgstr "Ausgewählte Tauchgänge aus Gruppe entfernen"
+msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Neu nummerieren"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Wiederholen"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "AMV"
@@ -727,11 +752,11 @@ msgstr "Verletzung des Sicherheitsstops"
msgid "Sat"
msgstr "Sa"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Speichern"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Speichern unter"
@@ -743,7 +768,7 @@ msgstr "Änderungen speichern?"
msgid "Save File As"
msgstr "Datei speichern unter"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Ereignisse auswählen"
@@ -764,11 +789,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Kürzester Tauchgang"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Spalten anzeigen"
@@ -788,15 +813,15 @@ msgstr "Warnung: Geschwindigkeit"
msgid "Start"
msgstr "Start"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Statistiken"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Statistiken"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Anzug"
@@ -805,11 +830,11 @@ msgstr "Anzug"
msgid "Sun"
msgstr "So"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Oberflächenpause"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Tabellenausdruck"
@@ -821,7 +846,7 @@ msgstr "Tankwechsel Vorschlag"
msgid "Tank Pressure Info"
msgstr "Info: Tankdruck"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Temperatur"
@@ -829,11 +854,11 @@ msgstr "Temperatur"
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Temperatur:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Drei"
@@ -841,11 +866,11 @@ msgstr "Drei"
msgid "Thu"
msgstr "Do"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Zeit"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Zoom ein-/ausschalten"
@@ -854,10 +879,18 @@ msgctxt "Duration"
msgid "Total"
msgstr "Gesamt"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Gesamtzeit"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgang)"
+msgstr[1] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)"
+
#: main.c:37
msgid "Tue"
msgstr "Di"
@@ -890,19 +923,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Uemis Initialisierung fehlgeschlagen"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Einheiten"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Ansicht"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Volumen:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Wassertemperatur"
@@ -910,7 +943,7 @@ msgstr "Wassertemperatur"
msgid "Wed"
msgstr "Mi"
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
msgid "Weight"
msgstr "Gewicht"
@@ -918,7 +951,7 @@ msgstr "Gewicht"
msgid "Weight System"
msgstr "Gewicht"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Gewicht:"
@@ -930,7 +963,7 @@ msgstr "XML Datei"
msgid "Year"
msgstr ""
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Jährliche Statistiken"
@@ -942,7 +975,7 @@ msgstr ""
"Nicht alle Änderungen wurden gespeichert.\n"
"Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -967,7 +1000,7 @@ msgstr "Gürtel"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -975,19 +1008,19 @@ msgstr "ft"
msgid "integrated"
msgstr "integriert"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "US Pfund"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "mehr als %d Tage"
@@ -996,7 +1029,7 @@ msgstr "mehr als %d Tage"
msgid "unkn"
msgstr "unbk"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "unbekannt"
diff --git a/po/es_ES.po b/po/es_ES.po
index 6db28aa23..c394e1d82 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-10-16 12:05+0100\n"
"Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
"Language-Team: Spanish\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr "> Mes"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr " Por favor, seleccione el ordenador de buceo y el dispositivo."
@@ -32,22 +32,46 @@ msgstr " Por favor, seleccione el ordenador de buceo y el dispositivo."
msgid "#"
msgstr "#"
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d minutos"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd, %dh %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dh %dmin"
@@ -57,19 +81,19 @@ msgstr "%dh %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) o (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "Acerca de"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Añadir buceo"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Añadir buceo"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Añadir al viaje anterior"
@@ -81,11 +105,11 @@ msgstr "abril"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Auto Group"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "se sumerge automáticamente en grupos de viajes"
@@ -109,55 +133,59 @@ msgctxt "Temp"
msgid "Average"
msgstr "Promedio"
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Promedio de Profundidad"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Promedio SAC"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Promedio Temp"
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "medio tiempo"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "Bar"
-#: info.c:484 info.c:911 print.c:155 gtk-gui.c:600
+#: info.c:488 info.c:915 print.c:156
+msgid "Buddy"
+msgstr ""
+
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Seleccionar archivo XML predeterminado"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Elegir archivos XML para importar en archivo de datos actual"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Cerrar"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Contraer todo"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Crear nuevo viaje por encima"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "CuFt"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Cil"
@@ -169,15 +197,15 @@ msgstr "Cilindro"
msgid "Cylinders"
msgstr "Cilindros"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Fecha"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Fecha y hora"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Fecha"
@@ -185,31 +213,31 @@ msgstr "Fecha"
msgid "Dec"
msgstr "Dec"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Default XML archivo"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Eliminar"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Dive Delete"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "dive Delete"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Eliminar inmersiones"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Profundidad"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Profundidad (%s):"
@@ -218,38 +246,39 @@ msgstr "Profundidad (%s):"
msgid "Depth Limit Exceeded"
msgstr "Superado límite de profundidad"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Profundidad"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Nombre del dispositivo"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Dive #%d -"
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Dive #%d - %s"
-#: info.c:106
-#, c-format
-msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
-msgstr "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
-
-#: gtk-gui.c:1120 info.c:669 statistics.c:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Dive info"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Notas de buceo"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Dive Time"
@@ -261,35 +290,35 @@ msgstr "Dive Alert Time"
msgid "Dive Time Info"
msgstr "Dive Time Info"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Dive Computer"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Dive detalle"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Dive Master"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Dive #"
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Divelist fuente"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Inmersiones"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Descargar desde el ordenador de buceo"
@@ -297,39 +326,39 @@ msgstr "Descargar desde el ordenador de buceo"
msgid "Duration"
msgstr "Duración"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Duración (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Editar"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Editar el viaje"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Editar Resumen del Viaje"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Editar buceo"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Editar inmersiones"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Editar inmersiones"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Edit viaje sumario"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Activar / Desactivar Eventos"
@@ -337,15 +366,15 @@ msgstr "Activar / Desactivar Eventos"
msgid "End"
msgstr "Fin"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Equipo"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Expandir todos"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -354,12 +383,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "No se pudo abrir %i archivos."
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "No se pudo '%s' parse"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "No puede analizar '%s'.\n"
@@ -378,15 +407,15 @@ msgstr "No se pudo leer '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "Pies"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Archivo"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "filtros"
@@ -394,7 +423,7 @@ msgstr "filtros"
msgid "Fri"
msgstr "Sun"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "El gas usado"
@@ -402,15 +431,15 @@ msgstr "El gas usado"
msgid "Gasmix"
msgstr "gas mezcla"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Ayuda"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Importar XML File(s)"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "info"
@@ -427,23 +456,23 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel y otros, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Lista"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "litro"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Ubicación"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Log"
@@ -452,7 +481,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Mayor"
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Longest buceo"
@@ -472,7 +501,7 @@ msgstr "Mar"
msgid "Marker"
msgstr "marcador"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "maestro"
@@ -480,23 +509,24 @@ msgstr "maestro"
msgid "Max Deco Time Warning"
msgstr "Max Deco Advertencia Tiempo"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Profundidad Max"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Max SAC"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:94
-#, c-format
+#: print.c:95
+#, fuzzy, c-format
msgid ""
-"%sMax depth: %.*f %s\n"
+"Max depth: %.*f %s\n"
"Duration: %d min\n"
+"%s"
msgstr ""
"%sProfundidad Máxima:.%.*f %s\n"
"Duración :%d minutos\n"
@@ -524,27 +554,27 @@ msgstr "Máximo"
msgid "May"
msgstr "Mayo"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Combinar viaje con el viaje de encima"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Combinar viaje con el viaje de abajo"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "metros"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Intensidad mínima"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Min SAC"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Min Temp"
@@ -563,7 +593,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Mínimo"
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Opciones Misc."
@@ -571,15 +601,15 @@ msgstr "Opciones Misc."
msgid "Mon"
msgstr "Mon"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Multi-plataforma de software en C DiveLog"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Nuevo"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Nuevo número de partida"
@@ -587,7 +617,7 @@ msgstr "Nuevo número de partida"
msgid "No Tank Data"
msgstr "Los datos de los tanques"
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Notas"
@@ -595,7 +625,7 @@ msgstr "Notas"
msgid "Nov"
msgstr "noviembre"
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "UTO"
@@ -603,11 +633,11 @@ msgstr "UTO"
msgid "Oct"
msgstr "Oct"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Abrir"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Abrir archivo"
@@ -623,11 +653,11 @@ msgstr "Ascender PO2 Warning"
msgid "PO2 Green Warning"
msgstr "Green Advertencia PO2"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Preferencias"
@@ -635,35 +665,35 @@ msgstr "Preferencias"
msgid "Pressure"
msgstr "Presión"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Presión"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Pretty Print"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Imprimir"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Imprimir sólo inmersiones seleccionadas"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Imprimir selección"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Imprimir escriba"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Perfiles"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Salir"
@@ -675,7 +705,7 @@ msgstr "RGT Alert"
msgid "RGT Warning"
msgstr "RGT Warning"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Rating"
@@ -684,27 +714,27 @@ msgstr "Rating"
msgid "Reading dive %s"
msgstr "Leyendo%s dive"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Eliminar Trip"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Eliminar de viaje de buceo"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
msgstr "Quitar saltos seleccionados de viaje"
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Renumerar"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Intentar de nuevo"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "SAC"
@@ -720,11 +750,11 @@ msgstr "Seguridad Violación Stop"
msgid "Sat"
msgstr "satélite"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Guardar"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Guardar como"
@@ -736,7 +766,7 @@ msgstr "Guardar cambios?"
msgid "Save File As"
msgstr "Guardar archivo como"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Seleccionar eventos"
@@ -757,11 +787,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Menor"
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Menor de buceo"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Mostrar columnas"
@@ -781,15 +811,15 @@ msgstr "Advertencia de velocidad"
msgid "Start"
msgstr "Inicio"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Estadísticas"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Estadísticas"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Suit"
@@ -798,11 +828,11 @@ msgstr "Suit"
msgid "Sun"
msgstr "Sun"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Surf Intv"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Tabla de impresión"
@@ -814,7 +844,7 @@ msgstr "El cambio sugerido Tank"
msgid "Tank Pressure Info"
msgstr "Tank info presión"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Temp"
@@ -822,11 +852,11 @@ msgstr "Temp"
msgid "Temperature"
msgstr "Temperatura"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Temperatura"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Three"
@@ -834,11 +864,11 @@ msgstr "Three"
msgid "Thu"
msgstr "Jue"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Tiempo"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Zoom Toggle"
@@ -847,11 +877,24 @@ msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Tiempo total"
-#: main.c:37 equipment.c:1485 equipment.c:1513
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main.c:37
+#, fuzzy
+msgid "Tue"
+msgstr "Jue"
+
+#: equipment.c:1485 equipment.c:1513
msgid "Type"
msgstr "Tipo"
@@ -879,19 +922,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "uemis init failed"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Unidades"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Ver"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Volumen"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Water Temp"
@@ -899,7 +942,7 @@ msgstr "Water Temp"
msgid "Wed"
msgstr "Wed"
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
msgid "Weight"
msgstr "Peso"
@@ -907,7 +950,7 @@ msgstr "Peso"
msgid "Weight System"
msgstr "Peso del sistema"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Peso"
@@ -919,7 +962,7 @@ msgstr "XML archivo"
msgid "Year"
msgstr "Año"
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Estadísticas anuales"
@@ -931,7 +974,7 @@ msgstr ""
"Has guardado los cambios \n"
"¿Te gustaría salvar a aquellos antes de cerrar el archivo de datos?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -956,7 +999,7 @@ msgstr "cinturón"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -964,19 +1007,19 @@ msgstr "ft"
msgid "integrated"
msgstr "integrado"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "libra"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "más de %d días"
@@ -985,7 +1028,7 @@ msgstr "más de %d días"
msgid "unkn"
msgstr "UNKN"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "desconocido"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 725518e60..137e07e29 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-10-15 22:41+0300\n"
"Last-Translator: Tommi Saviranta <wnd@iki.fi>\n"
"Language-Team: Finnish\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Kuukausi"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr "Valitse sukellustietokone ja laitenimi."
@@ -32,22 +32,46 @@ msgstr "Valitse sukellustietokone ja laitenimi."
msgid "#"
msgstr "#"
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Sukellus #%d - %s %02d-%02d-%04d, %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%d pv %d t %d min"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%d t %d min"
@@ -57,19 +81,19 @@ msgstr "%d t %d min"
msgid "(%s) or (%s)"
msgstr "(%s) tai (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "Tietoja"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Lisää sukellus"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Lisää sukellus"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Liitä yllä olevaan retkeen"
@@ -81,11 +105,11 @@ msgstr "huhti"
msgid "Aug"
msgstr "elo"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Automaattinen ryhmittely"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Ryhmittele sukellukset retkiin automaattisesti"
@@ -109,59 +133,59 @@ msgctxt "Temp"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Keskisyvyys"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Pintakulutus"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Keskilämpötila"
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Keskipituus"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "bar"
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Sukelluspari"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Valitse oletustiedosto"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Valitse tietoihin liitettävät XML-tiedostot"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Sulje"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Supista kaikki retket"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Liitä uuteen retkeen"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "kuutiojalka"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Säiliöt"
@@ -173,15 +197,15 @@ msgstr "Säiliöt"
msgid "Cylinders"
msgstr "Säiliöt"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Ajankohta"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Päivä ja aika"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Päivä:"
@@ -189,31 +213,31 @@ msgstr "Päivä:"
msgid "Dec"
msgstr "joulu"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Oletustiedosto"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Poista"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Poista sukellus"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Poista sukellus"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Poista sukellukset"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Syvyys"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Syvyys (%s):"
@@ -222,38 +246,39 @@ msgstr "Syvyys (%s):"
msgid "Depth Limit Exceeded"
msgstr "Syvyysraja ylitetty"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Syvyys:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Laitenimi"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Sukellus #%d - %s %02d-%02d-%04d, %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Sukellus #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Sukellus #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Tiedot"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Muistiinpanot"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Sukellusaika"
@@ -265,35 +290,35 @@ msgstr "Huomautus: sukellusaika"
msgid "Dive Time Info"
msgstr "Tiedotus: sukellusaika"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Sukellustietokone"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Tiedot"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Sukellusvanhin"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Sukellus"
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Sukelluslistan kirjasin"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Sukellusvanhin"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Sukelluskerrat"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Hae sukellustietokoneelta"
@@ -301,39 +326,39 @@ msgstr "Hae sukellustietokoneelta"
msgid "Duration"
msgstr "Kesto"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Kesto (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Muuta"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Muuta retken tietoja"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Muuta retken tietoja"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Muuta sukelluksen tietoja"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Muuta sukelluksen tietoja"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Muuta valittujen sukellusten tietoja"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Muuta retken tietoja"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Näytä / piilota tapahtumamerkit"
@@ -341,15 +366,15 @@ msgstr "Näytä / piilota tapahtumamerkit"
msgid "End"
msgstr "Loppu"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Varusteet"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Laajenna kaikki retket"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -358,12 +383,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "%i tiedoston avaaminen epäonnistui."
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Tiedoston '%s' lukeminen epäonnistui."
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
@@ -382,15 +407,15 @@ msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
msgid "Feb"
msgstr "helmi"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "jalka"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Tiedosto"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Suodattimet"
@@ -398,7 +423,7 @@ msgstr "Suodattimet"
msgid "Fri"
msgstr "pe"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Kulutus"
@@ -406,15 +431,15 @@ msgstr "Kulutus"
msgid "Gasmix"
msgstr "Kaasuseos"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Ohje"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Liitä tiedot XML-tiedostosta"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Tiedot"
@@ -431,23 +456,23 @@ msgstr "heinä"
msgid "Jun"
msgstr "kesä"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel et al., 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Sukelluslista"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "litra"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Kohde"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Loki"
@@ -456,7 +481,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Pisin"
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Pisin sukellus"
@@ -476,7 +501,7 @@ msgstr "maalis"
msgid "Marker"
msgstr "merkki"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "Sukellusvanhin"
@@ -484,19 +509,19 @@ msgstr "Sukellusvanhin"
msgid "Max Deco Time Warning"
msgstr "Varoitus: etappipysähdysaika"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Suurin syvyys"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Suurin pintakulutus"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Ylin lämpötila"
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -530,27 +555,27 @@ msgstr "Korkein"
msgid "May"
msgstr "touko"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Liitä retki yllä olevaan retkeen"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Liitä retki alla olevaan retkeen"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "metri"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Pienin syvyys"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Pienin pintakulutus"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Alin lämpötila"
@@ -569,7 +594,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Alin"
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Sekalaiset asetukset"
@@ -577,15 +602,15 @@ msgstr "Sekalaiset asetukset"
msgid "Mon"
msgstr "ma"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Usean laitealustan sukelluspäiväkirjaohjelma C-kielellä"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Uusi"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Uusi aloitusnumero"
@@ -593,7 +618,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:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Muistiinpanot"
@@ -601,7 +626,7 @@ msgstr "Muistiinpanot"
msgid "Nov"
msgstr "marras"
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "Happikertymä"
@@ -609,11 +634,11 @@ msgstr "Happikertymä"
msgid "Oct"
msgstr "loka"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Avaa"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Avaa tiedosto"
@@ -629,11 +654,11 @@ msgstr "Varoitus: hapen osapaine"
msgid "PO2 Green Warning"
msgstr "Varoitus: hapen osapaine (green) TODO"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Asetukset"
@@ -641,35 +666,35 @@ msgstr "Asetukset"
msgid "Pressure"
msgstr "Paine"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Paine:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Hieno tuloste"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Tulosta"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Tulosta valitut sukellukset"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Tulosteen valinta"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Tulosteen tyyppi"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profiilikuvaaja"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Lopeta"
@@ -681,7 +706,7 @@ msgstr "Huomautus: kaasumäärä"
msgid "RGT Warning"
msgstr "Varoitus: kaasumäärä"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Yleisarvio"
@@ -690,27 +715,27 @@ msgstr "Yleisarvio"
msgid "Reading dive %s"
msgstr "Luetaan sukellusta %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Poista retki"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Erota sukellus pois retkestä"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
msgstr "Erota valitut sukellukset pois retkestä"
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Uudellennumeroi"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Yritä uudestaan"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "Pintakulutus"
@@ -726,11 +751,11 @@ msgstr "Turvapysähdyksen laiminlyönti"
msgid "Sat"
msgstr "la"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Tallenna"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Tallenna nimellä..."
@@ -742,7 +767,7 @@ msgstr "Tallenna muutokset?"
msgid "Save File As"
msgstr "Tallenna nimellä"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Valitse tapahtumat"
@@ -763,11 +788,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Lyhin"
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Lyhin sukellus"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Näytä sarakkeet"
@@ -787,15 +812,15 @@ msgstr "Varoitus: nousunopeus"
msgid "Start"
msgstr "Alku"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Tilastot"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Tilastot"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Puku"
@@ -804,11 +829,11 @@ msgstr "Puku"
msgid "Sun"
msgstr "su"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Pinta-aika"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Taulukkotuloste"
@@ -820,7 +845,7 @@ msgstr "Säiliönvaihtoehdotus"
msgid "Tank Pressure Info"
msgstr "Tiedotus: säiliöpaine"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Lämpötila"
@@ -828,11 +853,11 @@ msgstr "Lämpötila"
msgid "Temperature"
msgstr "Lämpötila"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Lämpötila:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Kaikki"
@@ -840,11 +865,11 @@ msgstr "Kaikki"
msgid "Thu"
msgstr "to"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Kello"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Venytä sukellusprofiilikuvaajaa"
@@ -853,10 +878,18 @@ msgctxt "Duration"
msgid "Total"
msgstr "Yhteensä"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Kokonaisaika"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
#: main.c:37
msgid "Tue"
msgstr "ti"
@@ -889,19 +922,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Uemiksen lukeminen epäonnistui"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Yksiköt"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Näytä"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Tilavuus:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Veden lämpötila"
@@ -909,7 +942,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:642
msgid "Weight"
msgstr "Painot"
@@ -917,7 +950,7 @@ msgstr "Painot"
msgid "Weight System"
msgstr "Painot"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Massa:"
@@ -929,7 +962,7 @@ msgstr "XML-tiedosto"
msgid "Year"
msgstr "Vuosi"
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Vuositilastot"
@@ -941,7 +974,7 @@ msgstr ""
"Sinulla on tallentamattomia muutoksia.\n"
"Haluatko tallentaa muutokset ennen tietojen sulkemista?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -966,7 +999,7 @@ msgstr "vyöpaino"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -974,19 +1007,19 @@ msgstr "ft"
msgid "integrated"
msgstr "integroitu"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "pauna"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "yli %d päivää"
@@ -995,7 +1028,7 @@ msgstr "yli %d päivää"
msgid "unkn"
msgstr "tuntematon"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "tuntematon"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index b62fd5d86..e1121a38d 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-12-11 09:58+0200\n"
"Last-Translator: Jean-Noël Rouchon <jnoel@sissiou.net>\n"
"Language-Team: French\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Mois"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr " Merci de choisir un ordinateur de plongée et un port "
@@ -32,22 +32,46 @@ msgstr " Merci de choisir un ordinateur de plongée et un port "
msgid "#"
msgstr ""
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Plongée #%d - %s %02d/%02d/%04d à %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dh %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dh %dmin"
@@ -57,19 +81,19 @@ msgstr "%dh %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) ou (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "À propos"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Ajouter une plongée"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Ajouter une plongée"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Ajoutée au groupe au-dessus"
@@ -81,11 +105,11 @@ msgstr "Avr"
msgid "Aug"
msgstr "Aou"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Grouper automatiquement"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Grouper automatiquement les plongées"
@@ -109,59 +133,59 @@ msgctxt "Temp"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Profondeur moy."
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Consommation d'air moyenne"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Température Moy."
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Temps Moy."
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "bar"
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Binôme"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Entrez le fichier XML par défaut"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Entrez le fichier XML à importer dans les données actuelles"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Fermer"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Réduire tout"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Créer un nouveau groupe au-dessus"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "CuFt"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Blk"
@@ -173,15 +197,15 @@ msgstr "Block"
msgid "Cylinders"
msgstr "Blocks"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Date"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Date et Heure"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Date:"
@@ -189,31 +213,31 @@ msgstr "Date:"
msgid "Dec"
msgstr "Dec"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Fichier XML par défaut"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Supprimer"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Supprimer Plongée"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Supprimer plongée"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Supprimer plongées"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Profondeur"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Profondeur (%s):"
@@ -222,38 +246,39 @@ msgstr "Profondeur (%s):"
msgid "Depth Limit Exceeded"
msgstr "Profondeur Plafond Dépassée"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Profondeur:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Nom de l'appareil"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Plongée #%d - %s %02d/%02d/%04d à %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Plongée #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Plongée #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Détails Plongée"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Notes de Plongée"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Temps de Plongée"
@@ -265,35 +290,35 @@ msgstr "Alerte temps de plongée"
msgid "Dive Time Info"
msgstr "Information: Temps de Plongée"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Ordinateur de plongée"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Détails plongée"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Chef de Palanquée"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Plongée N°."
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Police pour la liste de plongée"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Chef de Palanquée"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Plongées"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Télécharger depuis l'ordinateur de plongée"
@@ -301,39 +326,39 @@ msgstr "Télécharger depuis l'ordinateur de plongée"
msgid "Duration"
msgstr "Durée"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Durée (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Éditer"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Éditer Informations Groupe"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Éditer Sommaire Groupe"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Éditer plongée"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Éditer plongées"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Éditer plusieur plongées"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Éditer Sommaire Groupe"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Activer / Désactiver Évênements"
@@ -341,15 +366,15 @@ msgstr "Activer / Désactiver Évênements"
msgid "End"
msgstr "Fin"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Équipment"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Afficher tout"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -358,12 +383,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "Échec de l'ouverture du fichier %i."
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Échec de l'analyse '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Échec de l'analyse '%s'.\n"
@@ -382,15 +407,15 @@ msgstr "Échec de la lecture '%s'.\n"
msgid "Feb"
msgstr "Fév"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "Pieds"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Fichier"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Filtrer"
@@ -398,7 +423,7 @@ msgstr "Filtrer"
msgid "Fri"
msgstr "Ven"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Air Utilisé"
@@ -406,15 +431,15 @@ msgstr "Air Utilisé"
msgid "Gasmix"
msgstr "Mélange gazeux"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Aide"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Importer fichier(s) XML"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Information"
@@ -431,23 +456,23 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel et autres, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "Litre"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Lieu"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Journal"
@@ -456,7 +481,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Plus longue"
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Plongée la plus longue"
@@ -476,7 +501,7 @@ msgstr "Mar"
msgid "Marker"
msgstr "Marker"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "Chef"
@@ -484,19 +509,19 @@ msgstr "Chef"
msgid "Max Deco Time Warning"
msgstr "Attention: Temps de Decopression Maximum"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Prof. Maximal"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Consommation d'air Max."
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Temp. Max."
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -530,27 +555,27 @@ msgstr "Maximum"
msgid "May"
msgstr "Mai"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Intégrer groupe dans le groupe au-dessus"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Intégrer groupe dans le groupe en-dessous"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "Mètre"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Profondeur Min."
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Temp. Min."
@@ -569,7 +594,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Options diverses"
@@ -577,15 +602,15 @@ msgstr "Options diverses"
msgid "Mon"
msgstr "Lun"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Journal de plongée multi-système écrit en C"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Nouveau"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Nouveau numéro de départ"
@@ -593,7 +618,7 @@ msgstr "Nouveau numéro de départ"
msgid "No Tank Data"
msgstr "Pas d'information sur le block"
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Notes"
@@ -601,7 +626,7 @@ msgstr "Notes"
msgid "Nov"
msgstr "Nov"
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "OTU"
@@ -609,11 +634,11 @@ msgstr "OTU"
msgid "Oct"
msgstr "Oct"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Ouvrir"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Ouvrir Fichier"
@@ -629,11 +654,11 @@ msgstr "Attention: Pression O2 Ascendant"
msgid "PO2 Green Warning"
msgstr "Attention: Pression O2 vert"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Préférences"
@@ -641,35 +666,35 @@ msgstr "Préférences"
msgid "Pressure"
msgstr "Pression"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Pression:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Jolie impression"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Imprimer"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Imprimer uniquement les plongées selectionnées"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Imprimer sélection"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Type d'impression"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Quitter"
@@ -681,7 +706,7 @@ msgstr "Alarm: resterende Gas-tijd"
msgid "RGT Warning"
msgstr "Attention: Temps d'air restant"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Évaluation"
@@ -690,27 +715,27 @@ msgstr "Évaluation"
msgid "Reading dive %s"
msgstr "Lecture plongée %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Supprimer Groupe"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Retirer plongée du groupe"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
msgstr "Retirer les plongées sélectionnées du groupe"
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Re-numéroter"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Re-essayer"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "Consommation d'air"
@@ -726,11 +751,11 @@ msgstr "Violation du palier de sécurité"
msgid "Sat"
msgstr "Sam"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Enregistrer"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Enregistrer sous"
@@ -742,7 +767,7 @@ msgstr "Enregistrer changements ?"
msgid "Save File As"
msgstr "Enregistrer Fichier sous"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Sélectionner évênements"
@@ -763,11 +788,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Plus courte"
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Plongée la plus courte"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Afficher colonne"
@@ -787,15 +812,15 @@ msgstr "Attention: vitesse"
msgid "Start"
msgstr "Début"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Statistiques"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Stats"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Combinaison"
@@ -804,11 +829,11 @@ msgstr "Combinaison"
msgid "Sun"
msgstr "Dim"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Intervale de surface"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Impression en tableau"
@@ -820,7 +845,7 @@ msgstr "Changement de block suggéré"
msgid "Tank Pressure Info"
msgstr "Information: Pression block"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Température"
@@ -828,11 +853,11 @@ msgstr "Température"
msgid "Temperature"
msgstr "Température"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Température:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Trois"
@@ -840,11 +865,11 @@ msgstr "Trois"
msgid "Thu"
msgstr "Jeu"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Temps"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Zoom avant/arrière"
@@ -853,10 +878,18 @@ msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Temps Total"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
#: main.c:37
msgid "Tue"
msgstr "MAr"
@@ -889,19 +922,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Uemis initialisation ratée"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Unités"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Vue"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Volume:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Température de l'eau"
@@ -909,7 +942,7 @@ msgstr "Température de l'eau"
msgid "Wed"
msgstr "Mer"
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
msgid "Weight"
msgstr "Poids"
@@ -917,7 +950,7 @@ msgstr "Poids"
msgid "Weight System"
msgstr "Système de Poids"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Poids:"
@@ -929,7 +962,7 @@ msgstr "Fichier XML"
msgid "Year"
msgstr "Année"
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Statistiques annuelles"
@@ -941,7 +974,7 @@ msgstr ""
"Vous avez des changements non-enregistrés.\n"
"Souhaitez-vous enregistrer ces changements avant de fermer ?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -966,7 +999,7 @@ msgstr "ceinture"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -974,19 +1007,19 @@ msgstr "ft"
msgid "integrated"
msgstr "intégré"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "US Pond"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "Plus de %d jours"
@@ -995,7 +1028,7 @@ msgstr "Plus de %d jours"
msgid "unkn"
msgstr "inconnu"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "inconnu"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 537cf79d0..09c574cad 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-13 20:06+0100\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-10-15 09:16+0100\n"
"Last-Translator: Ivan <ivan@velikibijeli.hr>\n"
"Language-Team: Croatian\n"
@@ -25,7 +25,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Mjesec"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr "Odaberite ronilačko računalo i naziv uređaja."
@@ -33,22 +33,46 @@ msgstr "Odaberite ronilačko računalo i naziv uređaja."
msgid "#"
msgstr ""
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Uron #%d - %s %02d/%02d/%04d u %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
@@ -58,19 +82,19 @@ msgstr "%dst %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) ili (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "O programu"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Dodaj uron"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Dodaj uron"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Dodaj u gornju grupu"
@@ -82,11 +106,11 @@ msgstr "Tra"
msgid "Aug"
msgstr "Kol"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Automatsko grupiranje"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Automatski grupiraj urone"
@@ -110,59 +134,59 @@ msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Prosječna dubina"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Prosječni SAC"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Prosječna temperatura"
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Prosječno vrijeme"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "Bar"
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Buddy"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celzijus"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Odaberite defaultnu XML datoteku"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Odaberite XML datoteke za uvoz u trenutačnu datoteku"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Zatvori"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Zatvori sve grupe"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Kreiraj novu grupu iznad"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "CuSt"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Boca"
@@ -174,15 +198,15 @@ msgstr "Boca"
msgid "Cylinders"
msgstr "Boce"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Datum"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Datum i vrijeme"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Datum:"
@@ -190,31 +214,31 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Pro"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Defaultna XML datoteka"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Obriši"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Obriši uron"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Obriši uron"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Obriši urone"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Dubina"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Dubina (%s):"
@@ -223,38 +247,39 @@ msgstr "Dubina (%s):"
msgid "Depth Limit Exceeded"
msgstr "Premašeno ograničenje dubine"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Dubina:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Naziv uređaja"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Uron #%d - %s %02d/%02d/%04d u %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Uron #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Uron #%d - %s"
-#: info.c:106
-#, c-format
-msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d"
-msgstr "Uron #%d - %s %02d/%02d/%04d u %d:%02d"
-
-#: gtk-gui.c:1120 info.c:669 statistics.c:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Informacije o uronu"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Bilješke"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Vrijeme urona"
@@ -266,35 +291,35 @@ msgstr "Alarm: Trajanje urona"
msgid "Dive Time Info"
msgstr "Info: Trajanje urona"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Ronilačko računalo"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Podaci o uronu"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Voditelj"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Uron br."
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Font za listu urona"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Voditelj"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Uroni"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Preuzmi s ronilačkog računala"
@@ -302,39 +327,39 @@ msgstr "Preuzmi s ronilačkog računala"
msgid "Duration"
msgstr "Trajanje"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Trajanje (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Uredi"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Uredi informacije o grupi"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Uredi sažetak grupe"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Uredi uron"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Uredi urone"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Uredi više urona"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Uredi sažetak urona"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Uključi/isključi događaje"
@@ -342,15 +367,15 @@ msgstr "Uključi/isključi događaje"
msgid "End"
msgstr "Kraj"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Oprema"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Otvori sve"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -359,12 +384,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "Nije uspjelo otvaranje %i datoteka"
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Nije uspjelo parsiranje '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Nije uspjelo parsiranje '%s'.\n"
@@ -383,15 +408,15 @@ msgstr "Nije uspjelo čitanje '%s'.\n"
msgid "Feb"
msgstr "Velj"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "Stope"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Datoteka"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Filter"
@@ -399,7 +424,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "Pet"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Potrošeno plina"
@@ -407,15 +432,15 @@ msgstr "Potrošeno plina"
msgid "Gasmix"
msgstr "Mješavina"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Pomoć"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Uvezi XML datoteke"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Informacije"
@@ -432,23 +457,23 @@ msgstr "Srp"
msgid "Jun"
msgstr "Lip"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel i drugi, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Popis"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "Litra"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Lokacija"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Dnevnik"
@@ -457,7 +482,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Max."
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Najduži uron"
@@ -477,7 +502,7 @@ msgstr "Ožu"
msgid "Marker"
msgstr "Oznaka"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "Master"
@@ -485,19 +510,19 @@ msgstr "Master"
msgid "Max Deco Time Warning"
msgstr "Upozorenje: Max. vrijeme dekompresije"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Najveća dubina"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Najveći SAC"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Najveća temperatura"
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -531,27 +556,27 @@ msgstr "Max."
msgid "May"
msgstr "Svi"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Spoji s grupom iznad"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Spoji s grupom ispod"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "Metar"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Najmanja dubina"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Najmanji SAC"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Min. temp."
@@ -570,7 +595,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Ostale opcije"
@@ -578,15 +603,15 @@ msgstr "Ostale opcije"
msgid "Mon"
msgstr "Pon"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Višeplatformski program za vođenje ronilačkog dnevnika pisan u C-u"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Novi"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Novi početni broj"
@@ -594,7 +619,7 @@ msgstr "Novi početni broj"
msgid "No Tank Data"
msgstr "Nema podatka o boci"
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Bilješke"
@@ -602,7 +627,7 @@ msgstr "Bilješke"
msgid "Nov"
msgstr "Stu"
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "OTU"
@@ -610,11 +635,11 @@ msgstr "OTU"
msgid "Oct"
msgstr "Lis"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Otvori"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Otvori datoteku"
@@ -630,11 +655,11 @@ msgstr "PO2 Upozorenje: Prebrzi izron"
msgid "PO2 Green Warning"
msgstr "PO2 Upozorenje: Zeleno"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "PSI"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Postavke"
@@ -642,35 +667,35 @@ msgstr "Postavke"
msgid "Pressure"
msgstr "Pritisak"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Pritisak:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Lijep ispis"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Ispis"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Ispiši odabrane urone"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Ispiši odabrano"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Vrsta ispisa"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Izlaz"
@@ -682,7 +707,7 @@ msgstr "RTG Alarm"
msgid "RGT Warning"
msgstr "RTG Upozorenje"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Ocjena"
@@ -691,27 +716,27 @@ msgstr "Ocjena"
msgid "Reading dive %s"
msgstr "Čitanje urona %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Obriši grupu"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Ukloni uron iz grupe"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
msgstr "Ukloni odabrane urone iz grupe"
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Renumeriraj"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Pokušaj ponovo"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "SAC"
@@ -727,11 +752,11 @@ msgstr "Kršenje sigurnosne stanke"
msgid "Sat"
msgstr "Sub"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Spremi"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Spremi kao"
@@ -743,7 +768,7 @@ msgstr "Spremi promjene?"
msgid "Save File As"
msgstr "Spremi datoteku kao"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Odaberi događaje"
@@ -764,11 +789,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Najkraći uron"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Prikaži stupce"
@@ -788,15 +813,15 @@ msgstr "Upozorenje: Brzina"
msgid "Start"
msgstr "Početak"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Statistike"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Statistike"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Odijelo"
@@ -805,11 +830,11 @@ msgstr "Odijelo"
msgid "Sun"
msgstr "Ned"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Površinski interval"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Tablični ispis"
@@ -821,7 +846,7 @@ msgstr "Preporučena izmjena boce"
msgid "Tank Pressure Info"
msgstr "Podaci od pritisku u boci"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Temp"
@@ -829,11 +854,11 @@ msgstr "Temp"
msgid "Temperature"
msgstr "Temperatura"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Temperatura:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Tri"
@@ -841,11 +866,11 @@ msgstr "Tri"
msgid "Thu"
msgstr "Čet"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Vrijeme"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Uključi/isključi povećanje"
@@ -854,10 +879,18 @@ msgctxt "Duration"
msgid "Total"
msgstr "Ukupno"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Lokalno vrijeme"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
#: main.c:37
msgid "Tue"
msgstr "Uto"
@@ -890,19 +923,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Uemis greška pri inicijalizaciji"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Jedinice"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Pregled"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Zapremnina:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Temperatura vode"
@@ -910,7 +943,7 @@ msgstr "Temperatura vode"
msgid "Wed"
msgstr "Sri"
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
msgid "Weight"
msgstr "Težina"
@@ -918,7 +951,7 @@ msgstr "Težina"
msgid "Weight System"
msgstr "Težina"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Težina:"
@@ -930,7 +963,7 @@ msgstr "XML datoteka"
msgid "Year"
msgstr "Godina"
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Godišnje statistike"
@@ -942,7 +975,7 @@ msgstr ""
"Imate promjena koje nisu spremljene\n"
"Želite li ih spremiti prije zatvaranja datoteke?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -967,7 +1000,7 @@ msgstr "pojas"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -975,19 +1008,19 @@ msgstr "ft"
msgid "integrated"
msgstr "integrirani"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "funte"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "više od %d dana"
@@ -996,7 +1029,7 @@ msgstr "više od %d dana"
msgid "unkn"
msgstr "nepoznat"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "nepoznato"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 5912a7ffa..8a2a1fceb 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-10-15 08:14+0100\n"
"Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
"Language-Team: Norwegian Bokmål\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Måned"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr " Velg dykkecomputer og enhet"
@@ -32,22 +32,46 @@ msgstr " Velg dykkecomputer og enhet"
msgid "#"
msgstr "#"
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Dykk #%d - %s %02d-%02d-%04d, %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dt %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dt %dmin"
@@ -57,19 +81,19 @@ msgstr "%dt %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) eller (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "Om"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Nytt dykk"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Nytt dykk"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Slå sammen med turen over"
@@ -81,11 +105,11 @@ msgstr "apr"
msgid "Aug"
msgstr "aug"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Grupper automatisk"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Grupper dykk som turer automatisk"
@@ -109,59 +133,59 @@ msgctxt "Temp"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Snittdybde"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Snitt-SAC"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Snitt-temp."
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Snitt-tid"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "bar"
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Buddy"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Velg standard XML-fil"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Velg hvilke XML-filer du vil importere"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Lukk"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Slå sammen alle"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Lag ny tur over denne"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "ft^3"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Flaske"
@@ -173,15 +197,15 @@ msgstr "Flaske"
msgid "Cylinders"
msgstr "Flasker"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Dato"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Dato og tid"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Dato:"
@@ -189,31 +213,31 @@ msgstr "Dato:"
msgid "Dec"
msgstr "des"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Standard XML-fil"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Slett"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Slett dykk"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Slett dykk"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Slett dykk"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Dybde"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Dybde (%s):"
@@ -222,38 +246,39 @@ msgstr "Dybde (%s):"
msgid "Depth Limit Exceeded"
msgstr "Maksgrense for dybde overskredet"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Dybde:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Enhetsnavn"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Dykk #%d - %s %02d-%02d-%04d, %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Dykk #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Dykk #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Informasjon"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Dykk"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Starttid"
@@ -265,35 +290,35 @@ msgstr "Alarm: dykketid"
msgid "Dive Time Info"
msgstr "Info: dykketid"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Dykkecomputer"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Detaljer"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Divemaster"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Dykk nr."
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Skrifttype for liste"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Dykk"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Last ned fra dykkecomputer"
@@ -301,39 +326,39 @@ msgstr "Last ned fra dykkecomputer"
msgid "Duration"
msgstr "Varighet"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Varighet (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Rediger"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Rediger turinformasjon"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Rediger tursammendrag"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Rediger dykk"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Rediger dykk"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Rediger flere dykk"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Rediger tursammendrag"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Skru på/av hendelser"
@@ -341,15 +366,15 @@ msgstr "Skru på/av hendelser"
msgid "End"
msgstr "Slutt"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Utstyr"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Ekspander alle"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -358,12 +383,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "Fikk ikke åpnet %i filer."
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Kunne ikke lese '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Kunne ikke lese '%s'.\n"
@@ -382,15 +407,15 @@ msgstr "Kunne ikke åpne '%s'.\n"
msgid "Feb"
msgstr "feb"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "fot"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Fil"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Filter"
@@ -398,7 +423,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "fre"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Gass brukt"
@@ -406,15 +431,15 @@ msgstr "Gass brukt"
msgid "Gasmix"
msgstr "Gassmiks"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Hjelp"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Importer XML-fil(er)"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Info"
@@ -431,23 +456,23 @@ msgstr "jul"
msgid "Jun"
msgstr "jun"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel med flere, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "liter"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Sted"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Logg"
@@ -456,7 +481,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Lengste"
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Lengste dykk"
@@ -476,7 +501,7 @@ msgstr "mar"
msgid "Marker"
msgstr "markering"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "master"
@@ -484,19 +509,19 @@ msgstr "master"
msgid "Max Deco Time Warning"
msgstr "Advarsel: maks dekotid"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Maks. dybde"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Maks. SAC"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Maks. temp."
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -530,27 +555,27 @@ msgstr "Maksimum"
msgid "May"
msgstr "mai"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Slå samme tur med turen over"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Slå sammen tur med turen under"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "meter"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Min. dybde"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Min. temp"
@@ -569,7 +594,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Ymse valg"
@@ -577,15 +602,15 @@ msgstr "Ymse valg"
msgid "Mon"
msgstr "man"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Dykkelogg i C for flere plattformer"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Ny"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Nytt startnummer"
@@ -593,7 +618,7 @@ msgstr "Nytt startnummer"
msgid "No Tank Data"
msgstr "Ingen tankinformasjon"
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Notater"
@@ -601,7 +626,7 @@ msgstr "Notater"
msgid "Nov"
msgstr "nov"
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "OTU"
@@ -609,11 +634,11 @@ msgstr "OTU"
msgid "Oct"
msgstr "okt"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Åpne"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Åpne fil"
@@ -629,11 +654,11 @@ msgstr "Advarsel: oppstigning /PO2"
msgid "PO2 Green Warning"
msgstr "Advarsel: grønn / PO2"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Valg"
@@ -641,35 +666,35 @@ msgstr "Valg"
msgid "Pressure"
msgstr "Trykk"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Trykk:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Pen utskrift"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Skriv ut"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Skriv ut valgte dykk"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Skriv ut valg"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Utskriftstype"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Avslutt"
@@ -681,7 +706,7 @@ msgstr "Alarm: gjenværende gasstid"
msgid "RGT Warning"
msgstr "Advarsel: gjenværende gasstid"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Vurdering"
@@ -690,27 +715,27 @@ msgstr "Vurdering"
msgid "Reading dive %s"
msgstr "Leser dykk %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Fjern tur"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Fjern dykk fra tur"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
msgstr "Fjern valgte dykk fra tur"
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Oppdater nummerering"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Prøv igjen"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "SAC"
@@ -726,11 +751,11 @@ msgstr "Brudd på sikkerhetsstopp"
msgid "Sat"
msgstr "lør"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Lagre"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Lagre som"
@@ -742,7 +767,7 @@ msgstr "Lagre endringer?"
msgid "Save File As"
msgstr "Lagre fil som"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Velg hendelser"
@@ -763,11 +788,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Korteste"
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Korteste dykk"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Vis kolonner"
@@ -787,15 +812,15 @@ msgstr "Advarsel: oppstigningshastighet"
msgid "Start"
msgstr "Start"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Statistikk"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Statistikk"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Drakt"
@@ -804,11 +829,11 @@ msgstr "Drakt"
msgid "Sun"
msgstr "søn"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Overflateintervall"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Tabellutskrift"
@@ -820,7 +845,7 @@ msgstr "Tankbytte foreslått"
msgid "Tank Pressure Info"
msgstr "Info: trykk"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Temp"
@@ -828,11 +853,11 @@ msgstr "Temp"
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Temperatur:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Alle"
@@ -840,11 +865,11 @@ msgstr "Alle"
msgid "Thu"
msgstr "tor"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Tid"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Zoom av/på"
@@ -853,10 +878,18 @@ msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Total tid"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
#: main.c:37
msgid "Tue"
msgstr "tir"
@@ -889,19 +922,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Klarer ikke å lese fra Uemis"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Enheter"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Vis"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Volum:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Vanntemperatur"
@@ -909,7 +942,7 @@ msgstr "Vanntemperatur"
msgid "Wed"
msgstr "ons"
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
msgid "Weight"
msgstr "Vekt"
@@ -917,7 +950,7 @@ msgstr "Vekt"
msgid "Weight System"
msgstr "Vektsystem"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Vekt:"
@@ -929,7 +962,7 @@ msgstr "XML-fil"
msgid "Year"
msgstr "År"
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Årsstatistikk"
@@ -941,7 +974,7 @@ msgstr ""
"Du har endringer som ikke er lagret.\n"
"Vil du lagre disse før du lukker datafila?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -966,7 +999,7 @@ msgstr "belte"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -974,19 +1007,19 @@ msgstr "ft"
msgid "integrated"
msgstr "integrert"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "pund"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "Min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "mer enn %d dager"
@@ -995,7 +1028,7 @@ msgstr "mer enn %d dager"
msgid "unkn"
msgstr "ukjent"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "ukjent"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 9b1f3f845..0dfff2a46 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-10-11 13:08+0100\n"
"Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
"Language-Team: Dutch\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Maand"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr " Selecteer duikcomputer en aansluiting. "
@@ -32,22 +32,46 @@ msgstr " Selecteer duikcomputer en aansluiting. "
msgid "#"
msgstr ""
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Duik #%d - %s %02d/%02d/%04d om %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
@@ -57,19 +81,19 @@ msgstr "%dst %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) of (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr ""
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Duik toevoegen"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Duik Toevoegen"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Trip hierboven toevoegen"
@@ -81,11 +105,11 @@ msgstr "Apr"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Automatisch groeperen"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Automatisch de duiken in trips groeperen"
@@ -109,59 +133,59 @@ msgctxt "Temp"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Gem. diepte"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Gem. gasverbruik"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Gem. Temperatuur"
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Gemiddelde tijd"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "bar"
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Buddy"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Kies standaard XML bestand"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Kies de XML bestanden om te importeren in huidig data bestand"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr ""
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Alle uitklappen"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Nieuwe trip hierboven invoegen"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Fles"
@@ -173,15 +197,15 @@ msgstr "Fles"
msgid "Cylinders"
msgstr "Flessen"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Datum"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Datum en tijd"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Datum:"
@@ -189,31 +213,31 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Dec"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Standaard XML bestand"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Verwijderen"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Duik verwijderen"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Duik verwijderen"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Duiken verwijderen"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Diepte"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Diepte (%s):"
@@ -222,38 +246,39 @@ msgstr "Diepte (%s):"
msgid "Depth Limit Exceeded"
msgstr "Diepte Limiet overschreden"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Diepte:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Apparaatnaam"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Duik #%d - %s %02d/%02d/%04d om %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Duik #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Duik #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Duik informatie"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Duiknotities"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Duiktijd"
@@ -265,35 +290,35 @@ msgstr "Alarm: Duiktijd"
msgid "Dive Time Info"
msgstr "Info: Duiktijd"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Duikcomputer"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Duikdetails"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Duik-instructeur"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Duik Nr."
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Duiklijst Font"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Duik-instructeur"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Duiken"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Download uit duikcomputer"
@@ -301,39 +326,39 @@ msgstr "Download uit duikcomputer"
msgid "Duration"
msgstr "Duur"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Duur (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Bewerken"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Trip informatie bewerken"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Trip overzicht bewerken"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Duik bewerken"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Duiken bewerken"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Bewerk meerdere duiken"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Trip overzicht bewerken"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Inschakelen / uitschakelen Evenementen"
@@ -341,15 +366,15 @@ msgstr "Inschakelen / uitschakelen Evenementen"
msgid "End"
msgstr "Einde"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Uitrusting"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Alle uitklappen"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -358,12 +383,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "Fout bij openen van %i bestanden."
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Fout bij analyse van '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Fout bij analyseren van '%s'.\n"
@@ -382,15 +407,15 @@ msgstr "Fout bij lezen van '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "Voet"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Bestand"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Filter"
@@ -398,7 +423,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "Vr"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Gas verbruikt"
@@ -406,15 +431,15 @@ msgstr "Gas verbruikt"
msgid "Gasmix"
msgstr "Gasmengsel"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Help"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Import XML bestand(en)"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Informatie"
@@ -431,23 +456,23 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel en anderen, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Lijst"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "Liter"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Locatie"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Log"
@@ -456,7 +481,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Langste"
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Langste duik"
@@ -476,7 +501,7 @@ msgstr "Mar"
msgid "Marker"
msgstr "Markering"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "Master"
@@ -484,19 +509,19 @@ msgstr "Master"
msgid "Max Deco Time Warning"
msgstr "Warnung: Maximale Deco tijd"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Max. Diepte"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Max. Gasverbruik"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -530,27 +555,27 @@ msgstr "Grootste"
msgid "May"
msgstr "Mei"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Trip met bovenstaande samenvoegen"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Trip met onderstaande samenvoegen"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "Meter"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Min. diepte"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Min. Gasverbruik"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Min. Temp."
@@ -569,7 +594,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Kleinste"
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Diverse opties"
@@ -577,15 +602,15 @@ msgstr "Diverse opties"
msgid "Mon"
msgstr "Ma"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Multi-Platform Duikprogramma in C"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr ""
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Nieuw begin nummer"
@@ -593,7 +618,7 @@ msgstr "Nieuw begin nummer"
msgid "No Tank Data"
msgstr "Geen fles informatie"
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Notities"
@@ -601,7 +626,7 @@ msgstr "Notities"
msgid "Nov"
msgstr "Nov"
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "OTU"
@@ -609,11 +634,11 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Bestand openen"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Bestand openen"
@@ -629,11 +654,11 @@ msgstr "Waarschuwing: Opstijging / PO2"
msgid "PO2 Green Warning"
msgstr "Waarschuwing: PO2 Groen"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Instellingen"
@@ -641,35 +666,35 @@ msgstr "Instellingen"
msgid "Pressure"
msgstr "Druk"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Druk:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Mooi afdrukken"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Afdrukken"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Alleen de geselecteerde duiken printen"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Selectie afdrukken"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Print type"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profiel"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr ""
@@ -681,7 +706,7 @@ msgstr "Alarm: resterende Gas-tijd"
msgid "RGT Warning"
msgstr "Warnung: resterende Gas-tijd"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Waardering"
@@ -690,27 +715,27 @@ msgstr "Waardering"
msgid "Reading dive %s"
msgstr "Lezen duik %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Trip verwijderen"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Duik uit trip verwijderen"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
msgstr "Geselecteerde duiken uit trip verwijderen"
-#: gtk-gui.c:802 gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Hernummeren"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Opnieuw"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "Gas verbruiksratio"
@@ -726,11 +751,11 @@ msgstr "veiligheidsstop overtreding"
msgid "Sat"
msgstr "Za"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Opslaan"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Bestand opslaan als"
@@ -742,7 +767,7 @@ msgstr "Aanpassingen opslaan?"
msgid "Save File As"
msgstr "Bestand opslaan als"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "gebeurtenissen selecteren"
@@ -763,11 +788,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Kortste"
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Kortste duik"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Kolommen afbeelden"
@@ -787,15 +812,15 @@ msgstr "Warnung: snelheid"
msgid "Start"
msgstr "Start"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Statistieken"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Statistieken"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Pak"
@@ -804,11 +829,11 @@ msgstr "Pak"
msgid "Sun"
msgstr "Zo"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Oppervlaktetijd"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Tabellenafdruk"
@@ -820,7 +845,7 @@ msgstr "Fleswissel voorgesteld"
msgid "Tank Pressure Info"
msgstr "Info: Flesdruk"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Temperatuur"
@@ -828,11 +853,11 @@ msgstr "Temperatuur"
msgid "Temperature"
msgstr "Temperatuur"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Temperatuur:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Drie"
@@ -840,11 +865,11 @@ msgstr "Drie"
msgid "Thu"
msgstr "Do"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Tijd"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Zoom in-/uitschakelen"
@@ -853,10 +878,18 @@ msgctxt "Duration"
msgid "Total"
msgstr "Totale"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Totale tijd"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
#: main.c:37
msgid "Tue"
msgstr "Di"
@@ -889,19 +922,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Uemis niet geinitialiseerd"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Eenheden"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Aanzicht"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Volume:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Watertemperatuur"
@@ -909,7 +942,7 @@ msgstr "Watertemperatuur"
msgid "Wed"
msgstr "Wo"
-#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640
+#: equipment.c:1012 equipment.c:1609 gtk-gui.c:642
msgid "Weight"
msgstr "Gewicht"
@@ -917,7 +950,7 @@ msgstr "Gewicht"
msgid "Weight System"
msgstr "Gewichtssysteem"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Gewicht:"
@@ -929,7 +962,7 @@ msgstr "XML bestand"
msgid "Year"
msgstr ""
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Jaarlijkse statistieken"
@@ -941,7 +974,7 @@ msgstr ""
"U heeft onopgeslagen wijzigingen.\n"
"Wilt u deze opslaan voordat u het databestand sluit?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -966,7 +999,7 @@ msgstr "riem"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -974,19 +1007,19 @@ msgstr "ft"
msgid "integrated"
msgstr "Geintergreerd"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "US Pond"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "Meer dan %d dagen"
@@ -995,7 +1028,7 @@ msgstr "Meer dan %d dagen"
msgid "unkn"
msgstr "Onbek"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "Onbekend"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index cef75ef3f..d60d780ae 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-0700\n"
"PO-Revision-Date: 2012-10-16 00:12+0100\n"
"Last-Translator: Jozef Ivanecký <dodo.sk@gmail.com>\n"
"Language-Team: Slovakian\n"
@@ -24,7 +24,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Mesiac"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr "Voľba typu počítača a zariadia. "
@@ -32,25 +32,46 @@ msgstr "Voľba typu počítača a zariadia. "
msgid "#"
msgstr "#"
-#: statistics.c:616
-#: statistics.c:618
-#: statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252
-#: statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Ponor #%d - %s %02d/%02d/%04d um %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %dh %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dh %dmin"
@@ -60,19 +81,19 @@ msgstr "%dh %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) alebo (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "Info"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Pridať Ponor"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Pridať ponor"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Pridať do akcie vyššie"
@@ -84,11 +105,11 @@ msgstr "Apr"
msgid "Aug"
msgstr "Aug"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Automatické zgrupovanie"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Automatické zrgupovanie do akcii"
@@ -112,68 +133,63 @@ msgctxt "Temp"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:683
-#: statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Priemerná hĺbka"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Priemerná spotreba"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Priemerná teplota"
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Priemerný čas"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "bar"
-#: info.c:484
-#: info.c:911
-#: print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Partner"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Vyber default XML súbor"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Vyber XML súbor pre import do aktuálneho data súboru"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Zatvoriť"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Zredukovať všetky"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Vytvoriť novú akciu nad"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "kubická stopa"
-#: divelist.c:1265
-#: gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Fľaša"
-#: equipment.c:926
-#: equipment.c:1062
+#: equipment.c:926 equipment.c:1062
msgid "Cylinder"
msgstr "Fľaša"
@@ -181,17 +197,15 @@ msgstr "Fľaša"
msgid "Cylinders"
msgstr "Fľaše"
-#: divelist.c:1258
-#: print.c:154
-#: statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Dátum"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Dátum a čas"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Dátum:"
@@ -199,32 +213,31 @@ msgstr "Dátum:"
msgid "Dec"
msgstr "Dec"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Default XML Súbor"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Zmazať"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Zmazať Ponor"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Zmazať ponor"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Zmazať ponory"
-#: print.c:154
-#: statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Hĺbka"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Hĺbka (%s):"
@@ -233,40 +246,39 @@ msgstr "Hĺbka (%s):"
msgid "Depth Limit Exceeded"
msgstr "Prekročená Maximálna Hĺbka"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Hĺbka:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Názov zariadenia"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Ponor #%d - %s %02d/%02d/%04d um %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Ponor #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Ponor #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Informácie"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Poznámky"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Čas Ponoru"
@@ -278,36 +290,35 @@ msgstr "Alarm Času Ponoru"
msgid "Dive Time Info"
msgstr "Info: Čas Ponoru"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Počítač"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Detaily ponoru"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Divemaster"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Ponor č."
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Font pre ponory"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Ponory"
-#: gtk-gui.c:911
-#: gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Nahratie údajov z počítača"
@@ -315,57 +326,55 @@ msgstr "Nahratie údajov z počítača"
msgid "Duration"
msgstr "Dĺžka (min)"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Dĺžka (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Editovať"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Editovať akciu"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Editovať sumár"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Editovať ponor"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Editovať ponory"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Editovať viac ponorov"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Editovať sumár"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
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:1118 info.c:508
msgid "Equipment"
msgstr "Výstroj"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Expandovať všetky"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -374,12 +383,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "Chyba pri otváraní %i súborov"
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Chyba pri spracovaní '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Chyba pri spracovaní '%s'.\n"
@@ -398,15 +407,15 @@ msgstr "Chyba pri načítaní '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "stopa"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Súbor"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Filter"
@@ -414,7 +423,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "Pi"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Použitá zmes"
@@ -422,15 +431,15 @@ msgstr "Použitá zmes"
msgid "Gasmix"
msgstr "Zmes"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Pomoc"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Import XML súboru"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Info"
@@ -447,27 +456,23 @@ msgstr "Jul"
msgid "Jun"
msgstr "Jun"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel a ďalší, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Zoznam"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "liter"
-#: divelist.c:1269
-#: info.c:458
-#: info.c:478
-#: info.c:905
-#: print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Miesto"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Log"
@@ -476,7 +481,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Najdlhší"
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Najdlhší ponor"
@@ -496,7 +501,7 @@ msgstr "Mar"
msgid "Marker"
msgstr "Značka"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "Master"
@@ -504,20 +509,19 @@ msgstr "Master"
msgid "Max Deco Time Warning"
msgstr "Upozornenie: Max. dekompresný čas"
-#: statistics.c:681
-#: statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Max. hĺbka"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Max. spotreba"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Max. teplota"
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -551,27 +555,27 @@ msgstr "Maximum"
msgid "May"
msgstr "Máj"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Spoj akciu s akciou nad"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Spoj akciu s akciou pod"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "meter"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Min. hĺbka"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Min. spotreba"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Min. teplota"
@@ -590,7 +594,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Rôzne voľby"
@@ -598,15 +602,15 @@ msgstr "Rôzne voľby"
msgid "Mon"
msgstr "Po"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Multiplatformový SW na správu ponorov v C"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Nový"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Nové začiatočné číslo"
@@ -614,9 +618,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:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Poznámky"
@@ -624,9 +626,7 @@ msgstr "Poznámky"
msgid "Nov"
msgstr "Nov"
-#: divelist.c:1268
-#: gtk-gui.c:635
-#: statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "OTU"
@@ -634,11 +634,11 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Otvoriť"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Otvoriť súbor"
@@ -654,49 +654,47 @@ msgstr "PO2 Upozornenie: Výstup"
msgid "PO2 Green Warning"
msgstr "PO2 Upozornenie: Zelená"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:570
-#: gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Nastavenia"
-#: equipment.c:954
-#: equipment.c:960
+#: equipment.c:954 equipment.c:960
msgid "Pressure"
msgstr "Tlak"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Tlak:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Pekná tlač"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Tlačiť"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Tlačiť vybrané ponory"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Tlačiť výber"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Druh tlače"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Koniec"
@@ -708,8 +706,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:493 info.c:920
msgid "Rating"
msgstr "Rating"
@@ -718,31 +715,27 @@ msgstr "Rating"
msgid "Reading dive %s"
msgstr "Načítavam ponor %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Vymaž akciu"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Vymaž ponor z akcie"
-#: divelist.c:2104
+#: divelist.c:2107
msgid "Remove selected dives from trip"
msgstr "Vymaž vybrané ponory z akcie"
-#: gtk-gui.c:802
-#: gtk-gui.c:914
+#: gtk-gui.c:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Prečíslovanie"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Skús znovu"
-#: divelist.c:1267
-#: gtk-gui.c:630
-#: statistics.c:160
-#: statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "Spotreba plynu"
@@ -758,11 +751,11 @@ msgstr "Nedodržaná bezpečnostná zastávka"
msgid "Sat"
msgstr "So"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Uložiť"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Uložiť ako"
@@ -774,8 +767,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:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Voľba udalosti"
@@ -796,16 +788,15 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Najkratší"
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Najkratší ponor"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Zobraz stĺpce"
-#: equipment.c:951
-#: equipment.c:1486
+#: equipment.c:951 equipment.c:1486
msgid "Size"
msgstr "Veľkosť"
@@ -817,23 +808,19 @@ 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:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Štatistika"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Štatistiky"
-#: divelist.c:1264
-#: gtk-gui.c:645
-#: info.c:490
-#: info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Oblek"
@@ -842,11 +829,11 @@ msgstr "Oblek"
msgid "Sun"
msgstr "Ne"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Povrchový interval"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Tlač tabuľky"
@@ -858,7 +845,7 @@ msgstr "Odporúčaná zmena fľaše"
msgid "Tank Pressure Info"
msgstr "Info: Tlak vo fľaši"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Teplota"
@@ -866,11 +853,11 @@ msgstr "Teplota"
msgid "Temperature"
msgstr "Teplota"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Teplota:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Strom"
@@ -878,12 +865,11 @@ msgstr "Strom"
msgid "Thu"
msgstr "Št"
-#: info.c:791
-#: print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Čas"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Zmeň zoom"
@@ -892,16 +878,23 @@ msgctxt "Duration"
msgid "Total"
msgstr "Celkový čas"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Celkový čas"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
#: main.c:37
msgid "Tue"
msgstr "Ut"
-#: equipment.c:1485
-#: equipment.c:1513
+#: equipment.c:1485 equipment.c:1513
msgid "Type"
msgstr "Typ"
@@ -929,19 +922,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Uemis - inicializácia neúspešná"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Jednotky"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Náhľad"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Objem:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Teplota vody"
@@ -949,9 +942,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:642
msgid "Weight"
msgstr "Závažie"
@@ -959,7 +950,7 @@ msgstr "Závažie"
msgid "Weight System"
msgstr "Závažie"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Závažie:"
@@ -971,8 +962,7 @@ msgstr "XML súbor"
msgid "Year"
msgstr "Rok"
-#: gtk-gui.c:915
-#: statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Ročná štatistika"
@@ -984,7 +974,7 @@ msgstr ""
"Máš neuložené zmeny.\n"
"Chceš ich uložiť pred zatvorením súboru?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1009,7 +999,7 @@ msgstr "opasok"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -1017,30 +1007,28 @@ msgstr "ft"
msgid "integrated"
msgstr "integrované"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263
-#: gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "US libra"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "min"
-#: statistics.c:493
+#: statistics.c:501
#, 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:532
+#: statistics.c:541
msgid "unknown"
msgstr "neznámy"
@@ -1054,7 +1042,6 @@ msgstr "hmotnosť"
#, fuzzy
#~ msgctxt "Depth"
-
#~ msgid ""
#~ "Depth\n"
#~ "Average"
@@ -1064,7 +1051,6 @@ msgstr "hmotnosť"
#, fuzzy
#~ msgctxt "Duration"
-
#~ msgid ""
#~ "Duration\n"
#~ "Total"
@@ -1074,7 +1060,6 @@ msgstr "hmotnosť"
#, fuzzy
#~ msgctxt "SAC"
-
#~ msgid ""
#~ "SAC\n"
#~ "Average"
@@ -1092,7 +1077,6 @@ msgstr "hmotnosť"
#, fuzzy
#~ msgctxt "Temp"
-
#~ msgid ""
#~ "Temperature\n"
#~ "Average"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 5dd113bb9..9691a0c3b 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 20:42-0700\n"
+"POT-Creation-Date: 2012-10-17 01:14-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"
@@ -25,7 +25,7 @@ msgctxt "Stats"
msgid " > Month"
msgstr " > Månad"
-#: gtk-gui.c:1502
+#: gtk-gui.c:1504
msgid " Please select dive computer and device. "
msgstr " Välj dykdator och enhet"
@@ -33,22 +33,46 @@ msgstr " Välj dykdator och enhet"
msgid "#"
msgstr ""
-#: statistics.c:616 statistics.c:618 statistics.c:620
+#: statistics.c:625 statistics.c:627 statistics.c:629
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: print.c:252 statistics.c:527
+#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
+#: print.c:72
+#, c-format
+msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
+msgstr ""
+
+#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
+#: print.c:229
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
+msgstr ""
+
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
+#: divelist.c:384
+#, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
+msgstr ""
+
+#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
+#: statistics.c:529
+#, fuzzy, c-format
+msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
+msgstr "Dykning #%d - %s %02d-%02d-%04d, %d:%02d"
+
+#: print.c:254 statistics.c:536
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:499
+#: statistics.c:507
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %dt %dmin"
-#: statistics.c:501
+#: statistics.c:509
#, c-format
msgid "%dh %dmin"
msgstr "%dt %dmin"
@@ -58,19 +82,19 @@ msgstr "%dt %dmin"
msgid "(%s) or (%s)"
msgstr "(%s) eller (%s)"
-#: gtk-gui.c:918
+#: gtk-gui.c:920
msgid "About"
msgstr "Om"
-#: gtk-gui.c:912
+#: gtk-gui.c:914
msgid "Add Dive"
msgstr "Ny dykning"
-#: divelist.c:2019
+#: divelist.c:2022
msgid "Add dive"
msgstr "Ny dykning"
-#: divelist.c:2098
+#: divelist.c:2101
msgid "Add to trip above"
msgstr "Kombinera med resan ovan"
@@ -82,11 +106,11 @@ msgstr "apr"
msgid "Aug"
msgstr "aug"
-#: gtk-gui.c:927
+#: gtk-gui.c:929
msgid "Autogroup"
msgstr "Gruppera automatiskt"
-#: gtk-gui.c:662
+#: gtk-gui.c:664
msgid "Automatically group dives in trips"
msgstr "Gruppera dykningar som resor automatisk"
@@ -110,59 +134,59 @@ msgctxt "Temp"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:683 statistics.c:720
+#: statistics.c:692 statistics.c:729
msgid "Avg Depth"
msgstr "Medeldjup"
-#: statistics.c:691
+#: statistics.c:700
msgid "Avg SAC"
msgstr "Medel-SAC"
-#: statistics.c:666
+#: statistics.c:675
msgid "Avg Temp"
msgstr "Medel-temp."
-#: statistics.c:673
+#: statistics.c:682
msgid "Avg Time"
msgstr "Medel-tid"
-#: gtk-gui.c:590
+#: gtk-gui.c:592
msgid "Bar"
msgstr "bar"
-#: info.c:484 info.c:911 print.c:155
+#: info.c:488 info.c:915 print.c:156
msgid "Buddy"
msgstr "Buddy"
-#: gtk-gui.c:600
+#: gtk-gui.c:602
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:520
+#: gtk-gui.c:522
msgid "Choose Default XML File"
msgstr "Välj standard XML-fil"
-#: gtk-gui.c:1396
+#: gtk-gui.c:1398
msgid "Choose XML Files To Import Into Current Data File"
msgstr "Välj vilken XML-filer du vill importera"
-#: gtk-gui.c:908
+#: gtk-gui.c:910
msgid "Close"
msgstr "Stäng"
-#: divelist.c:2115
+#: divelist.c:2118
msgid "Collapse all"
msgstr "Sammanslå alla"
-#: divelist.c:2088
+#: divelist.c:2091
msgid "Create new trip above"
msgstr "Ny resa innan"
-#: gtk-gui.c:596
+#: gtk-gui.c:598
msgid "CuFt"
msgstr "ft^3"
-#: divelist.c:1265 gtk-gui.c:620
+#: divelist.c:1268 gtk-gui.c:622
msgid "Cyl"
msgstr "Cyl"
@@ -174,15 +198,15 @@ msgstr "Cylinder"
msgid "Cylinders"
msgstr "Cylindrar"
-#: divelist.c:1258 print.c:154 statistics.c:711
+#: divelist.c:1261 print.c:155 statistics.c:720
msgid "Date"
msgstr "Datum"
-#: info.c:776
+#: info.c:780
msgid "Date and Time"
msgstr "Datum och tid"
-#: info.c:786
+#: info.c:790
msgid "Date:"
msgstr "Datum:"
@@ -190,31 +214,31 @@ msgstr "Datum:"
msgid "Dec"
msgstr "dec"
-#: gtk-gui.c:667
+#: gtk-gui.c:669
msgid "Default XML Data File"
msgstr "Standard XML-fil"
-#: info.c:227
+#: info.c:229
msgid "Delete"
msgstr "Radera"
-#: info.c:178
+#: info.c:180
msgid "Delete Dive"
msgstr "Radera dykning"
-#: divelist.c:2006
+#: divelist.c:2009
msgid "Delete dive"
msgstr "Radera dykning"
-#: divelist.c:2005
+#: divelist.c:2008
msgid "Delete dives"
msgstr "Radera dykningar"
-#: print.c:154 statistics.c:160
+#: print.c:155 statistics.c:160
msgid "Depth"
msgstr "Djup"
-#: info.c:836
+#: info.c:840
#, c-format
msgid "Depth (%s):"
msgstr "Djup (%s):"
@@ -223,38 +247,39 @@ msgstr "Djup (%s):"
msgid "Depth Limit Exceeded"
msgstr "Maxdjup Överskridits"
-#: gtk-gui.c:584
+#: gtk-gui.c:586
msgid "Depth:"
msgstr "Djup:"
-#: gtk-gui.c:1364
+#: gtk-gui.c:1366
msgid "Device name"
msgstr "Enhetsnamn"
+#. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
+#: info.c:107
+#, fuzzy, c-format
+msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
+msgstr "Dykning #%d - %s %02d-%02d-%04d, %d:%02d"
+
#: print.c:67
#, c-format
msgid "Dive #%d - "
msgstr "Dykning #%d - "
-#: info.c:144
+#: info.c:146
#, c-format
msgid "Dive #%d - %s"
msgstr "Dykning #%d - %s"
-#: info.c:106
-#, c-format
-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:702
+#: gtk-gui.c:1122 info.c:673 statistics.c:711
msgid "Dive Info"
msgstr "Information"
-#: gtk-gui.c:1112
+#: gtk-gui.c:1114
msgid "Dive Notes"
msgstr "Dykning"
-#: statistics.c:712
+#: statistics.c:721
msgid "Dive Time"
msgstr "Starttid"
@@ -266,35 +291,35 @@ msgstr "Dyktidslarm"
msgid "Dive Time Info"
msgstr "Dyktidsnot"
-#: gtk-gui.c:1333
+#: gtk-gui.c:1335
msgid "Dive computer"
msgstr "Dykdator"
-#: print.c:474
+#: print.c:476
msgid "Dive details"
msgstr "Detaljer"
-#: info.c:483
+#: info.c:487
msgid "Dive master"
msgstr "Divemaster"
-#: print.c:154
+#: print.c:155
msgid "Dive#"
msgstr "Dyknr"
-#: gtk-gui.c:650
+#: gtk-gui.c:652
msgid "Divelist Font"
msgstr "Font för dyklistan"
-#: info.c:910
+#: info.c:914
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:663
+#: statistics.c:672
msgid "Dives"
msgstr "Dykningar"
-#: gtk-gui.c:911 gtk-gui.c:1494
+#: gtk-gui.c:913 gtk-gui.c:1496
msgid "Download From Dive Computer"
msgstr "Nedladda från dykdator"
@@ -302,39 +327,39 @@ msgstr "Nedladda från dykdator"
msgid "Duration"
msgstr "Tid"
-#: info.c:831
+#: info.c:835
msgid "Duration (min)"
msgstr "Tid (min)"
-#: info.c:228
+#: info.c:230
msgid "Edit"
msgstr "Redigera"
-#: info.c:628
+#: info.c:632
msgid "Edit Trip Info"
msgstr "Redigera reseinformation"
-#: divelist.c:2027
+#: divelist.c:2030
msgid "Edit Trip Summary"
msgstr "Redigera resesammandrag"
-#: divelist.c:2003
+#: divelist.c:2006
msgid "Edit dive"
msgstr "Redigera dykning"
-#: divelist.c:2002
+#: divelist.c:2005
msgid "Edit dives"
msgstr "Redigera dykning"
-#: info.c:471
+#: info.c:475
msgid "Edit multiple dives"
msgstr "Redigera flera dykningar"
-#: info.c:453
+#: info.c:455
msgid "Edit trip summary"
msgstr "Redigera resesammandrag"
-#: gtk-gui.c:771
+#: gtk-gui.c:773
msgid "Enable / Disable Events"
msgstr "Aktivera / Inaktivera händelser"
@@ -342,15 +367,15 @@ msgstr "Aktivera / Inaktivera händelser"
msgid "End"
msgstr "Slut"
-#: gtk-gui.c:1116 info.c:504
+#: gtk-gui.c:1118 info.c:508
msgid "Equipment"
msgstr "Utrustning"
-#: divelist.c:2112
+#: divelist.c:2115
msgid "Expand all"
msgstr "Expandera alla"
-#: gtk-gui.c:601
+#: gtk-gui.c:603
msgid "Fahrenheit"
msgstr "Fahrenheit"
@@ -359,12 +384,12 @@ msgstr "Fahrenheit"
msgid "Failed to open %i files."
msgstr "Kunde inte öppna %i filer."
-#: parse-xml.c:1471
+#: parse-xml.c:1498
#, c-format
msgid "Failed to parse '%s'"
msgstr "Kunde inte läsa '%s'"
-#: parse-xml.c:1466
+#: parse-xml.c:1493
#, c-format
msgid "Failed to parse '%s'.\n"
msgstr "Kunde inte läsa '%s'.\n"
@@ -383,15 +408,15 @@ msgstr "Kunne inte öppna '%s'.\n"
msgid "Feb"
msgstr "feb"
-#: gtk-gui.c:586
+#: gtk-gui.c:588
msgid "Feet"
msgstr "fot"
-#: gtk-gui.c:899
+#: gtk-gui.c:901
msgid "File"
msgstr "Fil"
-#: gtk-gui.c:902
+#: gtk-gui.c:904
msgid "Filter"
msgstr "Filter"
@@ -399,7 +424,7 @@ msgstr "Filter"
msgid "Fri"
msgstr "fre"
-#: statistics.c:730
+#: statistics.c:739
msgid "Gas Used"
msgstr "Gasanvändning"
@@ -407,15 +432,15 @@ msgstr "Gasanvändning"
msgid "Gasmix"
msgstr "Gasmix"
-#: gtk-gui.c:903
+#: gtk-gui.c:905
msgid "Help"
msgstr "Hjälp"
-#: gtk-gui.c:910
+#: gtk-gui.c:912
msgid "Import XML File(s)"
msgstr "Importera XML-fil(er)"
-#: gtk-gui.c:921
+#: gtk-gui.c:923
msgid "Info"
msgstr "Info"
@@ -432,23 +457,23 @@ msgstr "jul"
msgid "Jun"
msgstr "jun"
-#: gtk-gui.c:854
+#: gtk-gui.c:856
msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
msgstr "Linus Torvalds, Dirk Hohndel med flera, 2011, 2012"
-#: gtk-gui.c:919
+#: gtk-gui.c:921
msgid "List"
msgstr "Lista"
-#: gtk-gui.c:595
+#: gtk-gui.c:597
msgid "Liter"
msgstr "liter"
-#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155
+#: divelist.c:1272 info.c:460 info.c:482 info.c:909 print.c:156
msgid "Location"
msgstr "Ställe"
-#: gtk-gui.c:900
+#: gtk-gui.c:902
msgid "Log"
msgstr "Log"
@@ -457,7 +482,7 @@ msgctxt "Duration"
msgid "Longest"
msgstr "Längsta"
-#: statistics.c:674
+#: statistics.c:683
msgid "Longest Dive"
msgstr "Längsta dykning"
@@ -477,7 +502,7 @@ msgstr "mar"
msgid "Marker"
msgstr "markering"
-#: print.c:154
+#: print.c:155
msgid "Master"
msgstr "master"
@@ -485,19 +510,19 @@ msgstr "master"
msgid "Max Deco Time Warning"
msgstr "Varning: max dekotid"
-#: statistics.c:681 statistics.c:719
+#: statistics.c:690 statistics.c:728
msgid "Max Depth"
msgstr "Maxdjup"
-#: statistics.c:689
+#: statistics.c:698
msgid "Max SAC"
msgstr "Max SAC"
-#: statistics.c:664
+#: statistics.c:673
msgid "Max Temp"
msgstr "Max temp"
-#: print.c:94
+#: print.c:95
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -531,27 +556,27 @@ msgstr "Maksimum"
msgid "May"
msgstr "mai"
-#: divelist.c:2035
+#: divelist.c:2038
msgid "Merge trip with trip above"
msgstr "Sammanslå resa med tidigare resa"
-#: divelist.c:2045
+#: divelist.c:2048
msgid "Merge trip with trip below"
msgstr "Sammanslå resa med senare resa"
-#: gtk-gui.c:585
+#: gtk-gui.c:587
msgid "Meter"
msgstr "meter"
-#: statistics.c:682
+#: statistics.c:691
msgid "Min Depth"
msgstr "Min. djup"
-#: statistics.c:690
+#: statistics.c:699
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:665
+#: statistics.c:674
msgid "Min Temp"
msgstr "Min. temp"
@@ -570,7 +595,7 @@ msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:656
+#: gtk-gui.c:658
msgid "Misc. Options"
msgstr "Diverse optioner"
@@ -578,15 +603,15 @@ msgstr "Diverse optioner"
msgid "Mon"
msgstr "mån"
-#: gtk-gui.c:851
+#: gtk-gui.c:853
msgid "Multi-platform divelog software in C"
msgstr "Dykningslog i C for flera platformer"
-#: gtk-gui.c:904
+#: gtk-gui.c:906
msgid "New"
msgstr "Ny"
-#: gtk-gui.c:811
+#: gtk-gui.c:813
msgid "New starting number"
msgstr "Nytt startnummer"
@@ -594,7 +619,7 @@ msgstr "Nytt startnummer"
msgid "No Tank Data"
msgstr "Ingen tankinformation"
-#: info.c:463 info.c:496 info.c:919
+#: info.c:465 info.c:500 info.c:923
msgid "Notes"
msgstr "Anteckningar"
@@ -602,7 +627,7 @@ msgstr "Anteckningar"
msgid "Nov"
msgstr "nov"
-#: divelist.c:1268 gtk-gui.c:635 statistics.c:728
+#: divelist.c:1271 gtk-gui.c:637 statistics.c:737
msgid "OTU"
msgstr "OTU"
@@ -610,11 +635,11 @@ msgstr "OTU"
msgid "Oct"
msgstr "okt"
-#: gtk-gui.c:905
+#: gtk-gui.c:907
msgid "Open"
msgstr "Öppna"
-#: gtk-gui.c:313
+#: gtk-gui.c:315
msgid "Open File"
msgstr "Öppna fil"
@@ -630,11 +655,11 @@ msgstr "Varning: uppstigning / PO2"
msgid "PO2 Green Warning"
msgstr "Varning: grön PO2"
-#: gtk-gui.c:591
+#: gtk-gui.c:593
msgid "PSI"
msgstr "psi"
-#: gtk-gui.c:570 gtk-gui.c:913
+#: gtk-gui.c:572 gtk-gui.c:915
msgid "Preferences"
msgstr "Optioner"
@@ -642,35 +667,35 @@ msgstr "Optioner"
msgid "Pressure"
msgstr "Tryck"
-#: gtk-gui.c:589
+#: gtk-gui.c:591
msgid "Pressure:"
msgstr "Tryck:"
-#: print.c:484
+#: print.c:486
msgid "Pretty print"
msgstr "Prydlig utskrift"
-#: gtk-gui.c:909
+#: gtk-gui.c:911
msgid "Print"
msgstr "Skriv ut"
-#: print.c:505
+#: print.c:507
msgid "Print only selected dives"
msgstr "Skriv ut valda dykningar"
-#: print.c:500
+#: print.c:502
msgid "Print selection"
msgstr "Skriv ut valda dykningar"
-#: print.c:478
+#: print.c:480
msgid "Print type"
msgstr "Utskriftstyp"
-#: gtk-gui.c:920
+#: gtk-gui.c:922
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:917
+#: gtk-gui.c:919
msgid "Quit"
msgstr "Avsluta"
@@ -682,7 +707,7 @@ msgstr "Alarm: gastid"
msgid "RGT Warning"
msgstr "Varning: gastid"
-#: info.c:489 info.c:916
+#: info.c:493 info.c:920
msgid "Rating"
msgstr "Värdering"
@@ -691,27 +716,27 @@ msgstr "Värdering"
msgid "Reading dive %s"
msgstr "Läser dykning %s"
-#: divelist.c:2050
+#: divelist.c:2053
msgid "Remove Trip"
msgstr "Radera resa"
-#: divelist.c:2106
+#: divelist.c:2109
msgid "Remove dive from trip"
msgstr "Ta bort dykning från resa"
-#: divelist.c:2104
+#: divelist.c:2107
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:804 gtk-gui.c:916
msgid "Renumber"
msgstr "Uppdatera numrering"
-#: gtk-gui.c:1471
+#: gtk-gui.c:1473
msgid "Retry"
msgstr "Pröva igen"
-#: divelist.c:1267 gtk-gui.c:630 statistics.c:160 statistics.c:727
+#: divelist.c:1270 gtk-gui.c:632 statistics.c:160 statistics.c:736
msgid "SAC"
msgstr "SAC"
@@ -727,11 +752,11 @@ msgstr "Brott på säkerhetsstop"
msgid "Sat"
msgstr "lör"
-#: gtk-gui.c:906
+#: gtk-gui.c:908
msgid "Save"
msgstr "Spara"
-#: gtk-gui.c:907
+#: gtk-gui.c:909
msgid "Save As"
msgstr "Spara som"
@@ -743,7 +768,7 @@ msgstr "Spara ändringar?"
msgid "Save File As"
msgstr "Spara fil som"
-#: gtk-gui.c:762 gtk-gui.c:916
+#: gtk-gui.c:764 gtk-gui.c:918
msgid "SelectEvents"
msgstr "Välj händelser"
@@ -764,11 +789,11 @@ msgctxt "Duration"
msgid "Shortest"
msgstr "Kortaste"
-#: statistics.c:675
+#: statistics.c:684
msgid "Shortest Dive"
msgstr "Kortaste dykning"
-#: gtk-gui.c:609
+#: gtk-gui.c:611
msgid "Show Columns"
msgstr "Visa kolumner"
@@ -788,15 +813,15 @@ msgstr "Varning: uppstigningshastighet"
msgid "Start"
msgstr "Start"
-#: statistics.c:655
+#: statistics.c:664
msgid "Statistics"
msgstr "Statistik"
-#: gtk-gui.c:1124
+#: gtk-gui.c:1126
msgid "Stats"
msgstr "Statistik"
-#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917
+#: divelist.c:1267 gtk-gui.c:647 info.c:494 info.c:921
msgid "Suit"
msgstr "Dräkt"
@@ -805,11 +830,11 @@ msgstr "Dräkt"
msgid "Sun"
msgstr "sön"
-#: statistics.c:713
+#: statistics.c:722
msgid "Surf Intv"
msgstr "Ytintervall"
-#: print.c:488
+#: print.c:490
msgid "Table print"
msgstr "Tabellutskrift"
@@ -821,7 +846,7 @@ msgstr "Tankbyte föreslått"
msgid "Tank Pressure Info"
msgstr "Info: tryck"
-#: gtk-gui.c:615
+#: gtk-gui.c:617
msgid "Temp"
msgstr "Temp"
@@ -829,11 +854,11 @@ msgstr "Temp"
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:599
+#: gtk-gui.c:601
msgid "Temperature:"
msgstr "Temperatur:"
-#: gtk-gui.c:922
+#: gtk-gui.c:924
msgid "Three"
msgstr "Alla"
@@ -841,11 +866,11 @@ msgstr "Alla"
msgid "Thu"
msgstr "tor"
-#: info.c:791 print.c:154
+#: info.c:795 print.c:155
msgid "Time"
msgstr "Tid"
-#: gtk-gui.c:928
+#: gtk-gui.c:930
msgid "Toggle Zoom"
msgstr "Zoom av/på"
@@ -854,10 +879,18 @@ msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:672
+#: statistics.c:681
msgid "Total Time"
msgstr "Total tid"
+#. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
+#: divelist.c:375
+#, c-format
+msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
+msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
+msgstr[0] ""
+msgstr[1] ""
+
#: main.c:37
msgid "Tue"
msgstr "tis"
@@ -890,19 +923,19 @@ msgstr ""
msgid "Uemis init failed"
msgstr "Kunde inte läsa från Uemis"
-#: gtk-gui.c:577
+#: gtk-gui.c:579
msgid "Units"
msgstr "Enheter"
-#: gtk-gui.c:901
+#: gtk-gui.c:903
msgid "View"
msgstr "Visa"
-#: gtk-gui.c:594
+#: gtk-gui.c:596
msgid "Volume:"
msgstr "Volum:"
-#: statistics.c:721
+#: statistics.c:730
msgid "Water Temp"
msgstr "Vattentemperatur"
@@ -910,7 +943,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:642
msgid "Weight"
msgstr "Vikt"
@@ -918,7 +951,7 @@ msgstr "Vikt"
msgid "Weight System"
msgstr "Viktsystem"
-#: gtk-gui.c:604
+#: gtk-gui.c:606
msgid "Weight:"
msgstr "Vikt:"
@@ -930,7 +963,7 @@ msgstr "XML-fil"
msgid "Year"
msgstr ""
-#: gtk-gui.c:915 statistics.c:360
+#: gtk-gui.c:917 statistics.c:368
msgid "Yearly Statistics"
msgstr "Årsstatistik"
@@ -942,7 +975,7 @@ msgstr ""
"Du har ändringer som inte är sparade.\n"
"Vill du spara dem förrän du stänger datafilen?"
-#: gtk-gui.c:242
+#: gtk-gui.c:241 gtk-gui.c:244
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -967,7 +1000,7 @@ msgstr "bälte"
msgid "clip-on"
msgstr "clip-on"
-#: divelist.c:1260
+#: divelist.c:1263
msgid "ft"
msgstr "ft"
@@ -975,19 +1008,19 @@ msgstr "ft"
msgid "integrated"
msgstr "integrerat"
-#: gtk-gui.c:605
+#: gtk-gui.c:607
msgid "kg"
msgstr "kg"
-#: divelist.c:1263 gtk-gui.c:606
+#: divelist.c:1266 gtk-gui.c:608
msgid "lbs"
msgstr "pund"
-#: divelist.c:1261
+#: divelist.c:1264
msgid "min"
msgstr "Min"
-#: statistics.c:493
+#: statistics.c:501
#, c-format
msgid "more than %d days"
msgstr "mer än %d dagar"
@@ -996,7 +1029,7 @@ msgstr "mer än %d dagar"
msgid "unkn"
msgstr "okänd"
-#: statistics.c:532
+#: statistics.c:541
msgid "unknown"
msgstr "okänd"
diff --git a/print.c b/print.c
index 1d4f68f07..e0fd2847c 100644
--- a/print.c
+++ b/print.c
@@ -68,7 +68,8 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w,
utc_mkdate(dive->when, &tm);
len = snprintf(buffer, sizeof(buffer),
- "%s%s, %s %d, %d %d:%02d",
+ /*++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min */
+ _("%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"),
divenr,
weekday(tm.tm_wday),
monthname(tm.tm_mon),
@@ -224,7 +225,8 @@ static void show_dive_table(struct dive *dive, cairo_t *cr, double w,
pango_layout_set_width(layout, colwidth);
utc_mkdate(dive->when, &tm);
len = snprintf(buffer, sizeof(buffer),
- "%s, %s %d, %d %dh%02d",
+ /*++GETTEXT 160 chars: weekday, monthname, day, year, hour, min */
+ _("%1$s, %2$s %3$d, %4$d %5$dh%6$02d"),
weekday(tm.tm_wday),
monthname(tm.tm_mon),
tm.tm_mday, tm.tm_year + 1900,
diff --git a/statistics.c b/statistics.c
index 047c6ea1e..db6e30a05 100644
--- a/statistics.c
+++ b/statistics.c
@@ -525,7 +525,8 @@ static void show_single_dive_stats(struct dive *dive)
utc_mkdate(dive->when, &tm);
snprintf(buf, sizeof(buf),
- "%s, %s %d, %d %2d:%02d",
+ /*++GETTEXT 80 chars: weekday, monthname, day, year, hour, min */
+ _("%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"),
weekday(tm.tm_wday),
monthname(tm.tm_mon),
tm.tm_mday, tm.tm_year + 1900,