summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-09 10:39:11 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-09 10:39:11 -0800
commit9d9eff718bff356ec679906dad87d0d9e48323f9 (patch)
tree8efd8075606ad31c5612f71cd61a99e6fe509e79
parent460060c430b6d6a2c3cd44d38f68ec6ea2598f9d (diff)
downloadsubsurface-9d9eff718bff356ec679906dad87d0d9e48323f9.tar.gz
Hopefully last change to po files
While this is a pain for everyone, I decided not to edit out the code reference noise - after all this is supposed to help translators find where the text is used in case it's unclear how to translate something. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--Makefile2
-rw-r--r--planner.c2
-rw-r--r--po/bg_BG.po571
-rw-r--r--po/de_CH.po673
-rw-r--r--po/de_DE.po673
-rw-r--r--po/es_ES.po571
-rw-r--r--po/fi_FI.po655
-rw-r--r--po/fr_FR.po571
-rw-r--r--po/hr_HR.po571
-rw-r--r--po/it_IT.po571
-rw-r--r--po/nb_NO.po610
-rw-r--r--po/nl_NL.po625
-rw-r--r--po/ru_RU.po655
-rw-r--r--po/sk_SK.po571
-rw-r--r--po/sv_SE.po655
15 files changed, 3827 insertions, 4149 deletions
diff --git a/Makefile b/Makefile
index fc3e6c44e..93996e372 100644
--- a/Makefile
+++ b/Makefile
@@ -237,7 +237,7 @@ $(NSIFILE): $(NSIINPUTFILE) Makefile
update-po-files:
xgettext -o po/subsurface-new.pot -s -k_ -kN_ --keyword=C_:1c,2 --add-comments="++GETTEXT" *.c
for i in po/*.po; do \
- msgmerge -s -U $$i po/subsurface-new.pot ; \
+ msgmerge --no-wrap -s -U $$i po/subsurface-new.pot ; \
done
EXTRA_FLAGS = $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
diff --git a/planner.c b/planner.c
index 847128866..6d7814abf 100644
--- a/planner.c
+++ b/planner.c
@@ -1206,7 +1206,7 @@ void input_plan()
char *labeltext;
int len;
- disclaimer = _("DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BÜHLMANN "
+ disclaimer = _("DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN "
"ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS "
"RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO "
"PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.");
diff --git a/po/bg_BG.po b/po/bg_BG.po
index 30e7f6a5f..439ab44b7 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: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2012-11-10 16:27+0300\n"
"Last-Translator: Lubomir I. Ivanov <neolit123@gmail.com>>\n"
"Language-Team: Bulgarian\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Месец"
@@ -32,48 +32,48 @@ msgstr ""
msgid " Please select dive computer and device. "
msgstr " Моля изберете леководолазен компютър и устройство. "
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr ""
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "№"
-#: print.c:322
+#: print.c:307
#, fuzzy, c-format
msgid "%.*f %s"
msgstr "%.*f %s/мин"
-#: print.c:267 print.c:340
+#: print.c:252 print.c:325
#, fuzzy, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s/мин"
-#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/мин"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr ""
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, c-format
msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s, %3$s, %2$s, %4$d, %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:584
+#: print.c:575
#, 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"
@@ -85,60 +85,60 @@ 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:551
+#: statistics.c:549
#, 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:609 statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d мин"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dд %dч %dмин"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dч %dмин"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr ""
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
"CNS:%u%%"
msgstr ""
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
"Calculated ceiling %.0f %s"
msgstr ""
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
"Deco:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
"Deco:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -147,82 +147,91 @@ msgid ""
"EADD:%d%s"
msgstr ""
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
"In deco"
msgstr ""
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
"MOD:%d%s"
msgstr ""
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
"NDL:%umin"
msgstr ""
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
"P:%d %s"
msgstr ""
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
"Safetystop:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
"Safetystop:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2107
+#: planner.c:468
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
"T:%.1f %s"
msgstr ""
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
"pHe:%.2fbar"
msgstr ""
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
"pN%s:%.2fbar"
msgstr ""
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
"pO%s:%.2fbar"
msgstr ""
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) или (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, fuzzy, c-format
msgid "(no dives)"
msgstr "Редактирай гмуркания"
@@ -231,53 +240,49 @@ msgstr "Редактирай гмуркания"
msgid "(nothing)"
msgstr ""
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr ""
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr ""
-#: print.c:907
-msgid "1 dive per page"
+#: planner.c:1253
+msgid "17 l/min"
msgstr ""
-#: planner.c:1231
-msgid "17 l/min"
+#: print.c:924
+msgid "2 dives per page"
msgstr ""
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr ""
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr ""
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr ""
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr ""
-#: planner.c:1203
+#: planner.c:1197
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given "
-"depth, takes the given time (if relative, e.g. '+3:30') or ends at the given "
-"time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
-"An entry that has a depth and a gas given but no time is special; it informs "
-"the planner that the gas specified is available for the ascent once the "
-"depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr ""
@@ -289,29 +294,29 @@ msgstr "За Subsurface"
msgid "Add Dive..."
msgstr "Добави Гмуркане..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Добави гмуркане"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Добави в горно пътуване"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr ""
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr ""
# ППК = Повърхностно Потребление на Кислород
-#: statistics.c:844
+#: statistics.c:847
#, fuzzy
msgid "Air Temp"
msgstr "Средна Темп."
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr ""
@@ -332,65 +337,65 @@ msgstr "Авг"
msgid "Autogroup"
msgstr "Автоматично групиране"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Средно"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Средно"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Средно"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Средно"
-#: statistics.c:799 statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Средна Дълбочина"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Средно ППК"
# ППК = Повърхностно Потребление на Кислород
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Средна Темп."
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Средно Време"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr ""
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "Бара"
-#: info.c:700 info.c:1153 print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Партньор"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr ""
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr ""
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr ""
@@ -398,11 +403,11 @@ msgstr ""
msgid "Cannot parse response!"
msgstr ""
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Целзии"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Моля Изберете XML Файл По Подразбиране"
@@ -414,7 +419,7 @@ msgstr "Моля Изберете XML Файлове За Вмъкване"
msgid "Close"
msgstr "Затвори"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Свиване на всички"
@@ -426,19 +431,19 @@ msgstr ""
msgid "Connection Error: "
msgstr ""
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Създай ново пътуване"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "Кб.Фута"
-#: divelist.c:1423 gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Бут."
-#: equipment.c:918 equipment.c:1029 print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Бутилка"
@@ -446,20 +451,24 @@ msgstr "Бутилка"
msgid "Cylinders"
msgstr "Бутилки"
-#: profile.c:2098
+#: profile.c:2102
#, fuzzy, c-format
msgid "D:%.1f %s"
msgstr "%.*f %s/мин"
-#: divelist.c:1416 print.c:510 statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Дата"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Дата и Час"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Дата:"
@@ -467,7 +476,7 @@ msgstr "Дата:"
msgid "Dec"
msgstr "Дек"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "XML Файл По Подразибране"
@@ -475,19 +484,19 @@ msgstr "XML Файл По Подразибране"
msgid "Delete a dive computer information entry"
msgstr ""
-#: divelist.c:2206 divelist.c:2259 divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Изтрий гмуркане"
-#: divelist.c:2208 divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Изтрий гмуркания"
-#: print.c:510 statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Дълбочина"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Дълбочина (%s):"
@@ -496,7 +505,7 @@ msgstr "Дълбочина (%s):"
msgid "Depth Limit Exceeded"
msgstr "Надминат Лимит На Дълбочина"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Дълбочина:"
@@ -515,12 +524,12 @@ msgstr ""
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Гмуркане №%1$d - %2$s %4$02d/%3$02d/%5$04d at %6$d:%7$02d"
-#: info.c:157 print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Гмуркане №%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Гмуркане №%d: %s %d %04d"
@@ -530,7 +539,7 @@ msgstr "Гмуркане №%d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Леководолазен Компютър"
-#: gtk-gui.c:1607 info.c:898 statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Информация"
@@ -538,11 +547,11 @@ msgstr "Информация"
msgid "Dive Notes"
msgstr "Бележки"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr ""
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Време"
@@ -558,11 +567,11 @@ msgstr "Времева Информация за Гмуркане"
msgid "Dive computer vendor and product"
msgstr ""
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Грешка при вход на данни"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Информяция за гмуркане"
@@ -571,27 +580,27 @@ msgstr "Информяция за гмуркане"
msgid "Dive locations"
msgstr "Бележки"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Водач"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr ""
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Гмуркане №"
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Шрифт за Списъка на Гмуркания"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Водач"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Гмуркания"
@@ -622,28 +631,28 @@ msgstr "Изтегли от Леководолазен Компютър..."
msgid "Download Success!"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Продълж. (мин.)"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Продълж. (мин.)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr ""
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr ""
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr ""
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr ""
@@ -660,42 +669,40 @@ msgstr "Име на устройство"
msgid "Edit Dive Computer Nicknames"
msgstr ""
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Редактиране на информация за пътуване"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Редактиране на обобщение за пътуване"
#: gtk-gui.c:1302
-msgid ""
-"Edit a dive computer nickname by double-clicking the in the relevant "
-"nickname field"
+msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr ""
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Редактиране на гмуркане"
-#: divelist.c:2405 divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
#, fuzzy
msgid "Edit dive date/time"
msgstr "Редактиране на гмуркане"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Редактирай гмуркания"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Редактиране на гмуркания"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Редактиране на обобщение за пътуване"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Включване / Изключване на Събития"
@@ -703,80 +710,78 @@ msgstr "Включване / Изключване на Събития"
msgid "End"
msgstr "Край"
-#: planner.c:1139
+#: planner.c:1149
#, fuzzy
msgid "Ending Depth"
msgstr "Мин. Дълбочина"
#: webservice.c:220
-msgid ""
-"Enter a user identifier and press 'Download'. Once the download is complete "
-"you can press 'Apply' if you wish to apply the changes."
+msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr ""
-#: gtk-gui.c:1603 info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Екипировка"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
#, fuzzy
msgid "Error obtaining water salinity"
msgstr "Грешка при рaзряд на стойности"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Грешка при разряд на дата и час"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Грешка при рaзряд на време за гмуркане"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Грешка при рaзряд на газ микс"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Грешка при рaзряд на газ микс брой"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Грешка при рaзряд на максимална дълбочина"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Грешка при рaзряд на стойности"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Грешка при регистриране на направление за отменяне"
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Грешка при регистриране на данни"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Грешка при регистриране на направление за събития"
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Събитие: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Събитие: изчаквание на действие от потребителя"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Разшири всички"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Фаренхайт"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Не могат да бъдат отворени %i файла"
@@ -791,12 +796,12 @@ msgstr "Не може да бъде напревен разбор на '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Не може да бъде напревен разбор на '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Не може да бъде прочетен '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Не може да бъде прочетен '%s'.\n"
@@ -805,7 +810,7 @@ msgstr "Не може да бъде прочетен '%s'.\n"
msgid "Feb"
msgstr "Фев"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "Фута"
@@ -825,48 +830,48 @@ msgstr ""
msgid "Fri"
msgstr "Пет"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr ""
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr ""
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr ""
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr ""
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr ""
-#: statistics.c:854
+#: statistics.c:857
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Използван Газ"
-#: planner.c:1141
+#: planner.c:1151
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Използван Газ"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr ""
-#: equipment.c:959 print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Газ Микс"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr ""
@@ -886,7 +891,7 @@ msgstr "Вмъкване на XML файл(ове)..."
msgid "Info"
msgstr "Информация"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr ""
@@ -920,11 +925,11 @@ msgstr "Линус Торвалдс, Дирк Хондел и други, 2011,
msgid "List"
msgstr "Списък"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "Литра"
-#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Местоположение"
@@ -932,12 +937,12 @@ msgstr "Местоположение"
msgid "Log"
msgstr "Регистър"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Най-дълго"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Най-дълго Гмуркане"
@@ -961,7 +966,7 @@ msgstr ""
msgid "Marker"
msgstr "Маркер"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Главен"
@@ -969,19 +974,19 @@ msgstr "Главен"
msgid "Max Deco Time Warning"
msgstr "Внимание: Максимално Време на Сигнал за Декомпресия"
-#: statistics.c:797 statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Макс. Дълбочина"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Макс. ППК"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Макс. Темп."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -992,7 +997,7 @@ msgstr ""
"Продължителност: %d мин\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr ""
@@ -1001,17 +1006,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Макс. Налягане"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Максимум"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Максимум"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Максимум"
@@ -1020,51 +1025,51 @@ msgstr "Максимум"
msgid "May"
msgstr "Май"
-#: divelist.c:2339
+#: divelist.c:2368
#, fuzzy
msgid "Merge dives"
msgstr "Изтрий гмуркания"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Слей пътуване с горно пътуване"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Слей пътуване с долно пътуване"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "Метра"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Мин. Дълбочина"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Мин. ППК"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Мин. Темп."
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Минимум"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Минимум"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Минимум"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Общи Настройки"
@@ -1080,7 +1085,7 @@ msgstr "Пон"
msgid "Multi-platform divelog software in C"
msgstr "Мултиплатформен, гмуркачески регистър-софтуер написан на C"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr ""
@@ -1088,7 +1093,7 @@ msgstr ""
msgid "New"
msgstr "Нов"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Нов стартов номер"
@@ -1105,7 +1110,7 @@ msgstr "Име на устройство"
msgid "No Tank Data"
msgstr "Няма Информация за Резервоар"
-#: info.c:611 info.c:725 info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Бележки"
@@ -1118,7 +1123,7 @@ msgid "OLF"
msgstr "OLF"
# АЗПК = Апарат за Поносимост на Кислород
-#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "АЗПК"
@@ -1127,7 +1132,7 @@ msgstr "АЗПК"
msgid "Oct"
msgstr "Окт"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Грешка върната от phread"
@@ -1135,7 +1140,7 @@ msgstr "Грешка върната от phread"
msgid "Ok to delete the selected entry?"
msgstr ""
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Отвори Файл"
@@ -1143,7 +1148,7 @@ msgstr "Отвори Файл"
msgid "Open..."
msgstr "Отвори..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr ""
@@ -1164,11 +1169,11 @@ msgstr "Внимание: Покачване на Парциално О2 Нал
msgid "PO2 Green Warning"
msgstr "Внимание: Парциално О2 Налягане в Зелената Зона"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "PSI"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr ""
@@ -1176,7 +1181,7 @@ msgstr ""
msgid "Planner"
msgstr ""
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Настройки"
@@ -1188,7 +1193,7 @@ msgstr "Настройки..."
msgid "Pressure"
msgstr "Налягане"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Налягане:"
@@ -1196,15 +1201,15 @@ msgstr "Налягане:"
msgid "Prev DC"
msgstr ""
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Напечатай само избраните гмуркания"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Напечатай селекцията"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Тип на печата"
@@ -1216,7 +1221,7 @@ msgstr "Напечатай..."
msgid "Profile"
msgstr "Профил"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
#, fuzzy
msgid "Profile Settings"
msgstr "Профил"
@@ -1233,7 +1238,7 @@ msgstr "Тревога: Оставащо Газ-Време"
msgid "RGT Warning"
msgstr "Внимание: Оставащо Газ-Време"
-#: info.c:705 info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Оценка"
@@ -1242,19 +1247,19 @@ msgstr "Оценка"
msgid "Reading %s %s"
msgstr "Четене на гмуркане %s"
-#: divelist.c:2051 divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Изтрий Пътуване"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Изтрий гмуркане от пътуване"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Изтрий избраните гмуркания от пътуване"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Преномерирай"
@@ -1266,20 +1271,20 @@ msgstr "Преномерирай..."
msgid "Retry"
msgstr "Опитай пак"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr ""
-#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "ППК"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr ""
-#: planner.c:1235
+#: planner.c:1257
#, fuzzy
msgid "SAC during dive"
msgstr "Добави гмуркане"
@@ -1300,24 +1305,29 @@ msgstr "Съб"
msgid "Save As..."
msgstr "Запиши като..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Запиши Промените?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Запиши Файл Като?"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Запиши като..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Запиши..."
-#: planner.c:1140
+#: planner.c:1150
#, fuzzy
msgid "Segment Time"
msgstr "Средно Време"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
#, fuzzy
msgid "Select Events"
msgstr "Избери Събития"
@@ -1339,54 +1349,54 @@ msgstr ""
"Кратък запис в req.txt файл\n"
"Uemis Zurich включен ли е правилно?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Най-къс"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Най-кратко Гмуркане"
-#: gtk-gui.c:653 gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Покажи Колони"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr ""
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr ""
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr ""
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr ""
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr ""
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr ""
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr ""
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr ""
-#: planner.c:191
+#: planner.c:192
#, fuzzy
msgid "Simulated Dive"
msgstr "Изтрий Гмуркане"
@@ -1407,15 +1417,15 @@ msgstr "Внимание: Скорост"
msgid "Start"
msgstr "Старт"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr ""
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Статистика"
-#: statistics.c:705
+#: statistics.c:708
#, fuzzy, c-format
msgid "Statistics %s"
msgstr "Статистика"
@@ -1429,20 +1439,12 @@ msgstr "Статистики"
msgid "Status"
msgstr "Статистики"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-
-#: divelist.c:1422 gtk-gui.c:684 info.c:706 info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Водолазен Костюм"
@@ -1451,20 +1453,20 @@ msgstr "Водолазен Костюм"
msgid "Sun"
msgstr "Нед"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Време на Повърхността"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr ""
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr ""
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Печат на таблица"
@@ -1476,19 +1478,19 @@ msgstr "Предложение за Смяна на Резорвоар"
msgid "Tank Pressure Info"
msgstr "Информация: Налагане на Резервоар"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr ""
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Температура"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Температура:"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Температура:"
@@ -1500,7 +1502,7 @@ msgstr "Комбиниран"
msgid "Thu"
msgstr "Чет"
-#: info.c:1016 print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Време"
@@ -1514,21 +1516,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Превключване на Зуум"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Общо Време"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Общо Време"
-#: print.c:336
+#: print.c:321
#, fuzzy, c-format
msgid "Total Weight:"
msgstr "Тегло:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
@@ -1570,25 +1572,25 @@ msgstr ""
"Излючете/Свържете на ново леководолазния компютър\n"
"и опитайте пак"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Uemis не може да бъде зареден"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Не може да бъде създаден libdivecomputer контекст"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Не може да бъде създаден разряд за %s %s"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Не може да бъдe отворен %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Единици"
@@ -1600,19 +1602,19 @@ msgstr ""
msgid "View"
msgstr "Изглед"
-#: info.c:711 statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr ""
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Обем:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr ""
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Темп. на Водата"
@@ -1624,28 +1626,28 @@ msgstr ""
msgid "Wed"
msgstr "Ср"
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Тежест"
-#: equipment.c:1084 print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Система за тежест"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Тегло:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML файл"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Година"
-#: gtk-gui.c:1371 statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Годишни статистики"
@@ -1654,14 +1656,11 @@ msgstr "Годишни статистики"
msgid ""
"You already have a dive computer of this model\n"
"named %s\n"
-"Subsurface can maintain a nickname for this device to distinguish it from "
-"the existing one. The default is the model and device ID as shown below.\n"
-"If you don't want to name this dive computer click 'Cancel' and Subsurface "
-"will simply display its model as its name (which may mean that you cannot "
-"tell the two dive computers apart in the logs)."
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
msgstr ""
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1669,7 +1668,7 @@ msgstr ""
"Имате незаписани промени.\n"
"Желаете ли да ги запишете преди затваряне на файла?"
-#: gtk-gui.c:211 gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1678,7 +1677,8 @@ msgstr ""
"Имате незаписани промени във файла %s.\n"
"Желаете ли да ги запишете преди затваряне на файла?"
-#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
+#: profile.c:399
#, c-format
msgid "air"
msgstr "въздух"
@@ -1723,7 +1723,7 @@ msgstr "таван (безопасен стоп)"
msgid "clip-on"
msgstr "щипка"
-#: dive.c:91 planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "кб.фута"
@@ -1756,37 +1756,37 @@ msgstr "време за гмуркане"
msgid "drysuit"
msgstr ""
-#: planner.c:727
+#: planner.c:734
#, fuzzy
msgid "ean"
msgstr "Ян"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr ""
-#: statistics.c:674
+#: statistics.c:677
#, fuzzy, c-format
msgid "for dive #%d"
msgstr "Гмуркане №%d - "
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr ""
-#: statistics.c:676
+#: statistics.c:679
#, fuzzy, c-format
msgid "for selected dive"
msgstr "Напечатай само избраните гмуркания"
-#: statistics.c:640
+#: statistics.c:643
#, fuzzy, c-format
msgid "for selected dives"
msgstr "Напечатай само избраните гмуркания"
-#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "фута"
@@ -1814,7 +1814,7 @@ msgstr "грешен номер на събитие"
msgid "jacket"
msgstr ""
-#: dive.c:141 equipment.c:1004 gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "кг"
@@ -1822,7 +1822,7 @@ msgstr "кг"
msgid "l"
msgstr "л"
-#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "паунда"
@@ -1830,15 +1830,15 @@ msgstr "паунда"
msgid "long john"
msgstr ""
-#: dive.c:112 info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "м"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr ""
-#: divelist.c:1427 gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr ""
@@ -1850,11 +1850,11 @@ msgstr "Макс. Дълбочина"
msgid "membrane"
msgstr ""
-#: divelist.c:1419 planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "мин"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
@@ -1864,7 +1864,7 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgid "more data dive id"
msgstr "повече от %d дни"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "повече от %d дни"
@@ -1877,16 +1877,16 @@ msgstr ""
msgid "none"
msgstr "няма"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr ""
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr ""
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr ""
@@ -1948,8 +1948,7 @@ msgstr "предавател"
msgid "unkn"
msgstr "неизв."
-#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "неизвестно"
diff --git a/po/de_CH.po b/po/de_CH.po
index c57e802cb..8a1712e8e 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2013-02-09 13:03+0100\n"
"Last-Translator: Martin Gysel <me@bearsh.org>\n"
"Language-Team: German\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Monat"
@@ -32,50 +32,48 @@ msgstr " herunterladen"
msgid " Please select dive computer and device. "
msgstr " Bitte Tauchcomputer und Gerät auswählen. "
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr "Anfang"
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr "Ende"
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "Nr."
-#: print.c:322
+#: print.c:307
+#, c-format
msgid "%.*f %s"
msgstr "%.*f %s"
-#: print.c:267
-#: print.c:340
+#: print.c:252 print.c:325
+#, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s\n"
-#: statistics.c:588
-#: statistics.c:735
-#: statistics.c:737
-#: statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr "%.0f%s %s\n"
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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:584
+#: print.c:575
#, 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"
@@ -87,33 +85,32 @@ 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:551
+#: statistics.c:549
#, 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:609
-#: statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr "%s"
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
@@ -122,7 +119,7 @@ msgstr ""
"%s\n"
"CNS:%u%%"
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
@@ -131,7 +128,7 @@ msgstr ""
"%s\n"
"Berechneter tiefster Deko-Stopp %.0f %s"
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
@@ -140,7 +137,7 @@ msgstr ""
"%s\n"
"Deko:%umin @ %.0f %s"
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
@@ -149,7 +146,7 @@ msgstr ""
"%s\n"
"Deko:unbk Zeit @ %.0f %s"
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -162,7 +159,7 @@ msgstr ""
"END:%d%s\n"
"EADD:%d%s"
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
@@ -171,7 +168,7 @@ msgstr ""
"%s\n"
"In Deko"
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
@@ -180,7 +177,7 @@ msgstr ""
"%s\n"
"MOD:%d%s"
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
@@ -189,7 +186,7 @@ msgstr ""
"%s\n"
"NDL:%umin"
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
@@ -198,7 +195,7 @@ msgstr ""
"%s\n"
"D:%d %s"
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
@@ -207,7 +204,7 @@ msgstr ""
"%s\n"
"Sicherheitsstopp:%umin @ %.0f %s"
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
@@ -216,7 +213,19 @@ msgstr ""
"%s\n"
"Sicherheitsstopp:unbk Zeit @ %.0f %s"
-#: profile.c:2107
+#: planner.c:468
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+"Subsurface Tauchplan\n"
+"basierend auf GFlow = %.0f und GFhigh = %.0f\n"
+"\n"
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
@@ -225,7 +234,7 @@ msgstr ""
"%s\n"
"T:%.1f %s"
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
@@ -234,7 +243,7 @@ msgstr ""
"%s\n"
"pHe:%.2fbar"
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
@@ -243,7 +252,7 @@ msgstr ""
"%s\n"
"pN%s:%.2fbar"
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
@@ -252,12 +261,13 @@ msgstr ""
"%s\n"
"pO%s:%.2fbar"
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) oder (%s)"
-#: statistics.c:680
+#: statistics.c:683
+#, c-format
msgid "(no dives)"
msgstr "(keine Tauchgänge)"
@@ -265,46 +275,48 @@ msgstr "(keine Tauchgänge)"
msgid "(nothing)"
msgstr "(nichts)"
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr "0.6 cuft/min"
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr "0.7 cuft/min"
-#: print.c:907
-msgid "1 dive per page"
-msgstr "1 Tauchgang pro Seite"
-
-#: planner.c:1231
+#: planner.c:1253
msgid "17 l/min"
msgstr "17 l/min"
+#: print.c:924
+#, fuzzy
+msgid "2 dives per page"
+msgstr "6 Tauchgänge pro Seite"
+
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr "Zweiteiler"
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr "20 l/min"
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr "3m Stufen für berechnete Deko-Stopps"
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr "6 Tauchgänge pro Seite"
-#: planner.c:1203
+#: planner.c:1197
+#, fuzzy
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
"<small>Segmente hier hinzufügen.\n"
"Jede Zeile beschreibt einen Abschnitt des geplanten Tauchgangs.\n"
@@ -313,12 +325,11 @@ msgstr ""
"Ein Eintrag mit Tiefe und Atemgas aber keiner Zeitangabe dient einem besonderen Zweck: er informiert den Plan-Algorithmus, dass das angegebene Atemgas für den Aufstieg verfügbar ist sobald die angegebene Tiefe erreicht ist.\n"
"CC SetPoint ist fuer CC (Kreislaufgerät) Tauchgänge; bitte nicht ausfüllen für Tauchgänge mit normalem OC Tauchgerät.</small>"
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr "Luft"
-#: gtk-gui.c:1054
-#: gtk-gui.c:1377
+#: gtk-gui.c:1054 gtk-gui.c:1377
msgid "About Subsurface"
msgstr "Info zu Subsurface"
@@ -326,27 +337,27 @@ msgstr "Info zu Subsurface"
msgid "Add Dive..."
msgstr "Tauchgang hinzufügen..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Tauchgang hinzufügen"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Zur obigen Reise hinzufügen"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr "Weiteren Abschnitt hinzufügen"
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr "Luftdruck"
-#: statistics.c:844
+#: statistics.c:847
msgid "Air Temp"
msgstr "Luft Temp"
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr "Lufttemp. in %s"
@@ -367,67 +378,64 @@ msgstr "Aug"
msgid "Autogroup"
msgstr "Automatisch gruppieren"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Ø"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Ø"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Ø"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:799
-#: statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Ø Tiefe"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Ø SAC"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Ø Temp"
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Ø Dauer"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr ""
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "bar"
-#: info.c:700
-#: info.c:1153
-#: print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Partner"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr "CC SetPoint"
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr "Abgebrochen, beende..."
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr "Abgebrochen..."
@@ -435,11 +443,11 @@ msgstr "Abgebrochen..."
msgid "Cannot parse response!"
msgstr "Verstehe die Antwort nicht!"
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Standard XML Datei auswählen"
@@ -451,7 +459,7 @@ msgstr "Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werde
msgid "Close"
msgstr "Schliessen"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Alle einfalten"
@@ -463,22 +471,19 @@ msgstr "Verbinde..."
msgid "Connection Error: "
msgstr "Verbindungsfehler: "
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Neue Reise darüber einfügen"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1423
-#: gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Flasche"
-#: equipment.c:918
-#: equipment.c:1029
-#: print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Flasche"
@@ -486,21 +491,24 @@ msgstr "Flasche"
msgid "Cylinders"
msgstr "Flaschen"
-#: profile.c:2098
+#: profile.c:2102
+#, c-format
msgid "D:%.1f %s"
msgstr "T:%.1f %s"
-#: divelist.c:1416
-#: print.c:510
-#: statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Datum"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Datum und Zeit"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Datum:"
@@ -508,7 +516,7 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Dez"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Standard XML Datei"
@@ -516,23 +524,19 @@ msgstr "Standard XML Datei"
msgid "Delete a dive computer information entry"
msgstr "Lösche die Informationen zu einem Tauchcomputer"
-#: divelist.c:2206
-#: divelist.c:2259
-#: divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Tauchgang löschen"
-#: divelist.c:2208
-#: divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Tauchgänge löschen"
-#: print.c:510
-#: statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Tiefe"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Tiefe (%s):"
@@ -541,7 +545,7 @@ msgstr "Tiefe (%s):"
msgid "Depth Limit Exceeded"
msgstr "Tiefenlimit überschritten"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Tiefe:"
@@ -559,13 +563,12 @@ msgstr "Gerät oder Einhängepunkt"
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"
-#: info.c:157
-#: print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Tauchgang #%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Tauchgang Nr. %d: %s %d %04d"
@@ -574,9 +577,7 @@ msgstr "Tauchgang Nr. %d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Bezeichnung für den Tauchcomputer"
-#: gtk-gui.c:1607
-#: info.c:898
-#: statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Informationen"
@@ -584,11 +585,11 @@ msgstr "Informationen"
msgid "Dive Notes"
msgstr "Notizen"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr "Tauchplan - DIES IST NUR EINE SUMULATION; NICHT ZUM TAUCHEN VERWENDEN"
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Dauer"
@@ -604,11 +605,11 @@ msgstr "Info: Tauchgangsdauer"
msgid "Dive computer vendor and product"
msgstr "Tauchcomputer Hersteller und Modell"
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Fehler beim Importieren der Daten des Tauchgangs"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Notizen zum Tauchgang"
@@ -616,27 +617,27 @@ msgstr "Notizen zum Tauchgang"
msgid "Dive locations"
msgstr "Tauchplätze"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Tauchguide"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr "Wann beginnt der Tauchgang?"
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Tauchgang Nr."
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Schriftart für Tauchliste"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Tauchguide"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Tauchgänge"
@@ -664,28 +665,28 @@ msgstr "Vom Webserver laden..."
msgid "Download Success!"
msgstr "Erfolgreich geladen!"
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Dauer"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Dauer (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr "O"
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr "EAN%d"
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr "EAN32"
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr "EAN36"
@@ -701,11 +702,11 @@ msgstr "Gerätename bearbeiten"
msgid "Edit Dive Computer Nicknames"
msgstr "Tauchcomputer Bezeichnung bearbeiten"
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Reisen-Informationen bearbeiten"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Reisen-Übersicht bearbeiten"
@@ -713,37 +714,35 @@ msgstr "Reisen-Übersicht bearbeiten"
msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr "Der Name des Tauchcomputers kann mittels Doppelklick bearbeitet werden"
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Tauchgang bearbeiten"
-#: divelist.c:2405
-#: divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
msgid "Edit dive date/time"
msgstr "Zeit des Tauchgangs bearbeiten"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Tauchgänge bearbeiten"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Mehrere Tauchgänge bearbeiten"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Reisen-Übersicht bearbeiten"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Ereignisse Ein-/Ausblenden"
-#: equipment.c:949
-#: equipment.c:1456
+#: equipment.c:949 equipment.c:1456
msgid "End"
msgstr "Ende"
-#: planner.c:1139
+#: planner.c:1149
msgid "Ending Depth"
msgstr "Tiefe am Ende"
@@ -751,69 +750,68 @@ msgstr "Tiefe am Ende"
msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr "Benutzerkennung eingeben und 'Laden' drücken. Bei Erfolg 'Anwenden' drücken um die Daten zu übernehmen."
-#: gtk-gui.c:1603
-#: info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Ausrüstung"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr "Fehler beim Auswerten des Salzgehalts"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Fehler beim Analysieren des Datums"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Fehler beim Analysieren der Dauer"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Fehler beim Analysieren der Gas Informationen"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Fehler beim Analysieren der Gas Informationen"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Fehler beim Analysieren der maximalen Tiefe"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Fehler beim Auswerten der Samples"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Fehler bei der Registrierung der Abbruchbehandlung"
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Fehler beim Registrieren der Daten"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Fehler beim Registrieren der Ereignisbehandlung"
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Ereignis: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Ereignis: warte auf Benutzer Aktion"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Alle ausfalten"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Fehler beim Öffnen von %i Dateien"
@@ -828,12 +826,12 @@ msgstr "Fehler beim Analysieren von '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Fehler beim Analysieren von '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Fehler beim Lesen von '%s'.\n"
@@ -842,7 +840,7 @@ msgstr "Fehler beim Lesen von '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "Fuss"
@@ -862,47 +860,46 @@ msgstr "Erzwinge erneutes Laden aller Tauchgänge"
msgid "Fri"
msgstr "Fr"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr "GFhigh"
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr "GFhigh für Tauchplan"
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr "GFlow"
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr "GFlow für Tauchplan"
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (WGS84 oder GPS Format)"
-#: statistics.c:854
+#: statistics.c:857
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gasverbrauch"
-#: planner.c:1141
+#: planner.c:1151
msgctxt "Type of"
msgid "Gas Used"
msgstr "Verw. Gas"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr "Gasverbrauch:\n"
-#: equipment.c:959
-#: print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Gasmischung"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr "Allg. Einstellungen"
@@ -922,7 +919,7 @@ msgstr "XML Datei(en) einlesen..."
msgid "Info"
msgstr "Informationen"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr "Verbindung aufbauen"
@@ -955,15 +952,11 @@ msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012, 2013"
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "Liter"
-#: divelist.c:1428
-#: info.c:606
-#: info.c:676
-#: info.c:1147
-#: print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Ort"
@@ -971,12 +964,12 @@ msgstr "Ort"
msgid "Log"
msgstr "Log"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Max."
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Längster Tauchgang"
@@ -1000,7 +993,7 @@ msgstr "Hier markieren"
msgid "Marker"
msgstr "Markierung"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Guide"
@@ -1008,20 +1001,19 @@ msgstr "Guide"
msgid "Max Deco Time Warning"
msgstr "Warnung: Maximale Deko Zeit"
-#: statistics.c:797
-#: statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Max. Tiefe"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Max. SAC"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -1032,7 +1024,7 @@ msgstr ""
"Dauer: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr "Max. CNS"
@@ -1041,17 +1033,17 @@ msgstr "Max. CNS"
msgid "MaxPress"
msgstr "Max. Druck"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Max."
@@ -1060,50 +1052,50 @@ msgstr "Max."
msgid "May"
msgstr "Mai"
-#: divelist.c:2339
+#: divelist.c:2368
msgid "Merge dives"
msgstr "Tauchgänge zusammenführen"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Reise mit der darüber verbinden"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Reise mit der darunter verbinden"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "Meter"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Min. Tiefe"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Min. Temp."
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Verschiedene Optionen"
@@ -1119,7 +1111,7 @@ msgstr "Mo"
msgid "Multi-platform divelog software in C"
msgstr "Multi-Platform Tauchprogram in C"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr "N"
@@ -1127,7 +1119,7 @@ msgstr "N"
msgid "New"
msgstr "Neu"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Neue erste Nummer"
@@ -1135,8 +1127,7 @@ msgstr "Neue erste Nummer"
msgid "Next DC"
msgstr "Nächster TC"
-#: gtk-gui.c:1274
-#: gtk-gui.c:1999
+#: gtk-gui.c:1274 gtk-gui.c:1999
msgid "Nickname"
msgstr "Gerätename"
@@ -1144,9 +1135,7 @@ msgstr "Gerätename"
msgid "No Tank Data"
msgstr "Keine Flaschen Informationen"
-#: info.c:611
-#: info.c:725
-#: info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Notizen"
@@ -1158,10 +1147,7 @@ msgstr "Nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426
-#: gtk-gui.c:722
-#: print.c:363
-#: statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1170,7 +1156,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Unbekannter pthread Fehlercode"
@@ -1178,7 +1164,7 @@ msgstr "Unbekannter pthread Fehlercode"
msgid "Ok to delete the selected entry?"
msgstr "Ausgewählten Eintrag löschen?"
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Datei öffnen"
@@ -1186,7 +1172,7 @@ msgstr "Datei öffnen"
msgid "Open..."
msgstr "Öffnen..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr "Sauerstoff"
@@ -1207,11 +1193,11 @@ msgstr "Warnung: Aufstieg / PO₂"
msgid "PO2 Green Warning"
msgstr "Warnung: PO₂ Grün"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "psi"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr "Auf Karte auswählen"
@@ -1219,7 +1205,7 @@ msgstr "Auf Karte auswählen"
msgid "Planner"
msgstr "Planer"
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Einstellungen"
@@ -1227,12 +1213,11 @@ msgstr "Einstellungen"
msgid "Preferences..."
msgstr "Einstellungen..."
-#: equipment.c:938
-#: equipment.c:944
+#: equipment.c:938 equipment.c:944
msgid "Pressure"
msgstr "Druck"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Druck:"
@@ -1240,15 +1225,15 @@ msgstr "Druck:"
msgid "Prev DC"
msgstr "Vorh. TC"
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Nur ausgewählte Tauchgänge drucken"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Auswahl drucken"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Art des Ausdrucks"
@@ -1260,7 +1245,7 @@ msgstr "Drucken..."
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
msgid "Profile Settings"
msgstr "Profil Einstellungen"
@@ -1276,29 +1261,28 @@ msgstr "Alarm: verbleibende Gas-Zeit"
msgid "RGT Warning"
msgstr "Warnung: verbleibende Gas-Zeit"
-#: info.c:705
-#: info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Bewertung"
#: uemis-downloader.c:364
+#, c-format
msgid "Reading %s %s"
msgstr "Lese %s %s"
-#: divelist.c:2051
-#: divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Reise entfernen"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Tauchgang aus Reise entfernen"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Neu nummerieren"
@@ -1310,24 +1294,20 @@ msgstr "Neu nummerieren..."
msgid "Retry"
msgstr "Wiederholen"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr "S"
-#: divelist.c:1425
-#: gtk-gui.c:674
-#: print.c:410
-#: statistics.c:182
-#: statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "SAC"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr "SAC während Dekostopp"
-#: planner.c:1235
+#: planner.c:1257
msgid "SAC during dive"
msgstr "SAC während des Tauchgangs"
@@ -1347,23 +1327,28 @@ msgstr "Sa"
msgid "Save As..."
msgstr "Speichern unter..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Änderungen speichern?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Datei speichern unter"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Speichern unter..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Speichern..."
-#: planner.c:1140
+#: planner.c:1150
msgid "Segment Time"
msgstr "Segment Dauer"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
msgid "Select Events"
msgstr "Ereignisse auswählen"
@@ -1383,60 +1368,58 @@ msgstr ""
"Unvollständiger Schreibvorgang der req.txt Datei\n"
"Ist der Uemis Zürich korrekt verbunden?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Kürzester Tauchgang"
-#: gtk-gui.c:653
-#: gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Spalten anzeigen"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr "EAD, END, EADD anzeigen"
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr "MOD anzeigen"
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr "Berechnete tiefste Deko-Stopps anzeigen"
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr "Vom TC ausgelesene tiefste Deko-Stopps in rot anzeigen"
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr "Auf Karte zeigen"
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr "pHe Diagramm anzeigen"
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr "pN%s Diagramm anzeigen"
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr "pO%s Diagramm anzeigen"
-#: planner.c:191
+#: planner.c:192
msgid "Simulated Dive"
msgstr "Simulierter Tauchgang"
-#: equipment.c:935
-#: equipment.c:1453
+#: equipment.c:935 equipment.c:1453
msgid "Size"
msgstr "Grösse"
@@ -1448,20 +1431,20 @@ msgstr "Alarm: Geschwindigkeit"
msgid "Speed Warning"
msgstr "Warnung: Geschwindigkeit"
-#: equipment.c:946
-#: equipment.c:1455
+#: equipment.c:946 equipment.c:1455
msgid "Start"
msgstr "Start"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr "Fange an zu laden"
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Statistiken"
-#: statistics.c:705
+#: statistics.c:708
+#, c-format
msgid "Statistics %s"
msgstr "Statistiken %s"
@@ -1473,26 +1456,12 @@ msgstr "Statistiken"
msgid "Status"
msgstr "Status"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s\n"
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-"Subsurface Tauchplan\n"
-"basierend auf GFlow = %.0f und GFhigh = %.0f\n"
-"\n"
-
-#: divelist.c:1422
-#: gtk-gui.c:684
-#: info.c:706
-#: info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Anzug"
@@ -1501,20 +1470,20 @@ msgstr "Anzug"
msgid "Sun"
msgstr "So"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Oberflächenpause"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr "Druck an der Oberfläche (mbar)"
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr "Gaswechsel zu %s\n"
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Tabellenausdruck"
@@ -1526,19 +1495,19 @@ msgstr "Flaschenwechsel Vorschlag"
msgid "Tank Pressure Info"
msgstr "Info: Flaschendruck"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr "Tec Einstellungen"
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temperatur"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Temperatur:"
@@ -1550,8 +1519,7 @@ msgstr "Drei"
msgid "Thu"
msgstr "Do"
-#: info.c:1016
-#: print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Zeit"
@@ -1567,20 +1535,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Zoom ein-/ausschalten"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Gesamt"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Gesamtzeit"
-#: print.c:336
+#: print.c:321
+#, c-format
msgid "Total Weight:"
msgstr "Gesamtgewicht:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Auftauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s\n"
@@ -1597,8 +1566,7 @@ msgstr[1] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)"
msgid "Tue"
msgstr "Di"
-#: equipment.c:1452
-#: equipment.c:1480
+#: equipment.c:1452 equipment.c:1480
msgid "Type"
msgstr "Typ"
@@ -1622,25 +1590,25 @@ msgstr ""
"Bitte den Tauchcomputer ausstecken und wieder einstecken\n"
"und erneut versuchen"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Uemis Initialisierung fehlgeschlagen"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Fehler beim Erzeugen des libdivecomputer Contexts"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Nicht in der Lage, einen Parser für %s %s zu erstellen"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Fehler beim Öffnen von %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Einheiten"
@@ -1652,20 +1620,19 @@ msgstr "Benutzerkennung"
msgid "View"
msgstr "Ansicht"
-#: info.c:711
-#: statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr "Sicht"
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Volumen:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr "W"
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Wassertemperatur"
@@ -1677,32 +1644,28 @@ msgstr "Webservice"
msgid "Wed"
msgstr "Mi"
-#: equipment.c:985
-#: equipment.c:1579
-#: gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Gewicht"
-#: equipment.c:1084
-#: print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Gewicht"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Gewicht:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML Datei"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Jahr"
-#: gtk-gui.c:1371
-#: statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Jährliche Statistiken"
@@ -1719,7 +1682,7 @@ msgstr ""
"Subsurface kann einen Namen für dieses Gerät verwalten um die Geräte zu unterscheiden. Die Voreinstellung ist unten angezeigt.\n"
"Falls kein Name gewünscht ist, bitte 'Abbrechen' klicken. Subsurface zeigt dann einfach den Produktnamen an (in diesem Fall können eventuell verschiedene Tauchcomputer nicht mehr in den angezeigten Daten unterschieden werden)."
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1727,8 +1690,7 @@ msgstr ""
"Nicht alle Änderungen wurden gespeichert.\n"
"Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
-#: gtk-gui.c:211
-#: gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1737,10 +1699,7 @@ msgstr ""
"Nicht alle Änderungen in der Datei %s wurden gespeichert.\n"
"Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
-#: divelist.c:544
-#: planner.c:74
-#: planner.c:725
-#: print.c:183
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
#: profile.c:399
#, c-format
msgid "air"
@@ -1786,8 +1745,7 @@ msgstr "Sicherheits-Stopp"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91
-#: planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "cuft"
@@ -1819,36 +1777,36 @@ msgstr "Dauer"
msgid "drysuit"
msgstr "Trockentauchanzug"
-#: planner.c:727
+#: planner.c:734
msgid "ean"
msgstr "ean"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr "für alle Tauchgänge"
-#: statistics.c:674
+#: statistics.c:677
+#, c-format
msgid "for dive #%d"
msgstr "für Tauchgang Nr.%d"
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr "für Tauchgänge Nr."
-#: statistics.c:676
+#: statistics.c:679
+#, c-format
msgid "for selected dive"
msgstr "für den ausgewählten Tauchgang"
-#: statistics.c:640
+#: statistics.c:643
+#, c-format
msgid "for selected dives"
msgstr "für die ausgewählten Tauchgänge"
-#: dive.c:117
-#: divelist.c:1418
-#: info.c:1078
-#: planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1856,8 +1814,7 @@ msgstr "ft"
msgid "full suit"
msgstr "Tauchanzug"
-#: libdivecomputer.c:151
-#: libdivecomputer.c:154
+#: libdivecomputer.c:151 libdivecomputer.c:154
msgid "gaschange"
msgstr "Flaschenwechsel"
@@ -1877,9 +1834,7 @@ msgstr "ungültige Ereignisnummer"
msgid "jacket"
msgstr "Jacke"
-#: dive.c:141
-#: equipment.c:1004
-#: gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1887,10 +1842,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137
-#: divelist.c:1421
-#: equipment.c:1006
-#: gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "US Pfund"
@@ -1898,17 +1850,15 @@ msgstr "US Pfund"
msgid "long john"
msgstr "Latzhose"
-#: dive.c:112
-#: info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr "max. ppO₂"
-#: divelist.c:1427
-#: gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr "max. CNS"
@@ -1920,12 +1870,11 @@ msgstr "Max. Tiefe"
msgid "membrane"
msgstr "Membran"
-#: divelist.c:1419
-#: planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
@@ -1934,7 +1883,7 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgid "more data dive id"
msgstr "mehr Daten für Tauchgang ID"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "mehr als %d Tage"
@@ -1947,16 +1896,16 @@ msgstr "No-Stopp Zeit"
msgid "none"
msgstr "keine"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr "pHe Schwelle"
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr "pN%s Schwelle"
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr "pO%s Schwelle"
@@ -2016,16 +1965,11 @@ msgstr ""
msgid "transmitter"
msgstr "Sender"
-#: equipment.c:1345
-#: equipment.c:1365
+#: equipment.c:1345 equipment.c:1365
msgid "unkn"
msgstr "unbk"
-#: libdivecomputer.c:152
-#: print.c:317
-#: statistics.c:563
-#: statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "unbekannt"
@@ -2053,6 +1997,9 @@ msgstr "Nass-Tauchanzug"
msgid "workload"
msgstr "Arbeit"
+#~ msgid "1 dive per page"
+#~ msgstr "1 Tauchgang pro Seite"
+
#~ msgid "About"
#~ msgstr "Info"
@@ -2061,16 +2008,16 @@ msgstr "Arbeit"
#~ msgid "Delete"
#~ msgstr "Löschen"
-#~ msgctxt "Depth"
+#~ msgctxt "Depth"
#~ msgid ""
#~ "Depth\n"
#~ "Average"
#~ msgstr ""
#~ "Tiefe\n"
#~ "Ø"
-#~ msgctxt "Duration"
+#~ msgctxt "Duration"
#~ msgid ""
#~ "Duration\n"
#~ "Total"
@@ -2083,8 +2030,8 @@ msgstr "Arbeit"
#~ msgid "Pretty print"
#~ msgstr "Schön drucken"
-#~ msgctxt "SAC"
+#~ msgctxt "SAC"
#~ msgid ""
#~ "SAC\n"
#~ "Average"
@@ -2099,8 +2046,8 @@ msgstr "Arbeit"
#~ msgstr ""
#~ "\n"
#~ "Min."
-#~ msgctxt "Temp"
+#~ msgctxt "Temp"
#~ msgid ""
#~ "Temperature\n"
#~ "Average"
diff --git a/po/de_DE.po b/po/de_DE.po
index 8e9ce236b..f156f6a5b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2013-02-09 10:03-0800\n"
"Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
"Language-Team: German\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Monat"
@@ -31,50 +31,48 @@ msgstr " herunterladen"
msgid " Please select dive computer and device. "
msgstr " Bitte Tauchcomputer und Gerät auswählen. "
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr " Anfang"
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr " Ende"
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "Nr."
-#: print.c:322
+#: print.c:307
+#, c-format
msgid "%.*f %s"
msgstr "%.*f %s"
-#: print.c:267
-#: print.c:340
+#: print.c:252 print.c:325
+#, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s\n"
-#: statistics.c:588
-#: statistics.c:735
-#: statistics.c:737
-#: statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr "%.0f%s %s\n"
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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:584
+#: print.c:575
#, 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"
@@ -86,33 +84,32 @@ 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:551
+#: statistics.c:549
#, 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:609
-#: statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr "%s"
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
@@ -121,7 +118,7 @@ msgstr ""
"%s\n"
"CNS:%u%%"
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
@@ -130,7 +127,7 @@ msgstr ""
"%s\n"
"Berechneter tiefster Deko-Stopp %.0f %s"
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
@@ -139,7 +136,7 @@ msgstr ""
"%s\n"
"Deko:%umin @ %.0f %s"
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
@@ -148,7 +145,7 @@ msgstr ""
"%s\n"
"Deko:unbk Zeit @ %.0f %s"
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -161,7 +158,7 @@ msgstr ""
"END:%d%s\n"
"EADD:%d%s"
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
@@ -170,7 +167,7 @@ msgstr ""
"%s\n"
"In Deko"
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
@@ -179,7 +176,7 @@ msgstr ""
"%s\n"
"MOD:%d%s"
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
@@ -188,7 +185,7 @@ msgstr ""
"%s\n"
"NDL:%umin"
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
@@ -197,7 +194,7 @@ msgstr ""
"%s\n"
"D:%d %s"
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
@@ -206,7 +203,7 @@ msgstr ""
"%s\n"
"Sicherheitsstopp:%umin @ %.0f %s"
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
@@ -215,7 +212,19 @@ msgstr ""
"%s\n"
"Sicherheitsstopp:unbk Zeit @ %.0f %s"
-#: profile.c:2107
+#: planner.c:468
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+"Subsurface Tauchplan\n"
+"basierend auf GFlow = %.0f und GFhigh = %.0f\n"
+"\n"
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
@@ -224,7 +233,7 @@ msgstr ""
"%s\n"
"T:%.1f %s"
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
@@ -233,7 +242,7 @@ msgstr ""
"%s\n"
"pHe:%.2fbar"
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
@@ -242,7 +251,7 @@ msgstr ""
"%s\n"
"pN%s:%.2fbar"
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
@@ -251,12 +260,13 @@ msgstr ""
"%s\n"
"pO%s:%.2fbar"
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) oder (%s)"
-#: statistics.c:680
+#: statistics.c:683
+#, c-format
msgid "(no dives)"
msgstr "(keine Tauchgänge)"
@@ -264,46 +274,48 @@ msgstr "(keine Tauchgänge)"
msgid "(nothing)"
msgstr "(nichts)"
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr "0.6 cu.ft./min"
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr "0.7 cu.ft./min"
-#: print.c:907
-msgid "1 dive per page"
-msgstr "1 Tauchgang pro Seite"
-
-#: planner.c:1231
+#: planner.c:1253
msgid "17 l/min"
msgstr "17 l/min"
+#: print.c:924
+#, fuzzy
+msgid "2 dives per page"
+msgstr "6 Tauchgänge pro Seite"
+
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr "Zweiteiler"
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr "20 l/min"
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr "3m Stufen für berechnete Deko-Stopps"
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr "6 Tauchgänge pro Seite"
-#: planner.c:1203
+#: planner.c:1197
+#, fuzzy
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
"<small>Segmente hier hinzufügen.\n"
"Jede Zeile beschreibt einen Abschnitt des geplanten Tauchgangs.\n"
@@ -312,12 +324,11 @@ msgstr ""
"Ein Eintrag mit Tiefe und Atemgas aber keiner Zeitangabe dient einem besonderen Zweck: er informiert den Plan-Algorithmus, dass das angegebene Atemgas für den Aufstieg verfügbar ist sobald die angegebene Tiefe erreicht ist.\n"
"CC SetPoint ist fuer CC (Kreislaufgerät) Tauchgänge; bitte nicht ausfüllen für Tauchgänge mit normalem OC Tauchgerät.</small>"
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr "Luft"
-#: gtk-gui.c:1054
-#: gtk-gui.c:1377
+#: gtk-gui.c:1054 gtk-gui.c:1377
msgid "About Subsurface"
msgstr "Info zu Subsurface"
@@ -325,27 +336,27 @@ msgstr "Info zu Subsurface"
msgid "Add Dive..."
msgstr "Tauchgang hinzufügen..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Tauchgang hinzufügen"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Zur obigen Reise hinzufügen"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr "Weiteren Abschnitt hinzufügen"
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr "Luftdruck"
-#: statistics.c:844
+#: statistics.c:847
msgid "Air Temp"
msgstr "Luft Temp"
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr "Lufttemp. in %s"
@@ -366,67 +377,64 @@ msgstr "Aug"
msgid "Autogroup"
msgstr "Automatisch gruppieren"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Ø"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Ø"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Ø"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:799
-#: statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Ø Tiefe"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Ø AMV"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Ø Temp"
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Ø Dauer"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr "Notausstieg mittels offenem System"
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "bar"
-#: info.c:700
-#: info.c:1153
-#: print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Partner"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr "CC SetPoint"
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr "Abgebrochen, beende..."
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr "Abgebrochen..."
@@ -434,11 +442,11 @@ msgstr "Abgebrochen..."
msgid "Cannot parse response!"
msgstr "Verstehe die Antwort nicht!"
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Standard XML Datei auswählen"
@@ -450,7 +458,7 @@ msgstr "Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werde
msgid "Close"
msgstr "Schließen"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Alle einfalten"
@@ -462,22 +470,19 @@ msgstr "Verbinde..."
msgid "Connection Error: "
msgstr "Verbindungsfehler: "
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Neue Reise darüber einfügen"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1423
-#: gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Flasche"
-#: equipment.c:918
-#: equipment.c:1029
-#: print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Flasche"
@@ -485,21 +490,24 @@ msgstr "Flasche"
msgid "Cylinders"
msgstr "Flaschen"
-#: profile.c:2098
+#: profile.c:2102
+#, c-format
msgid "D:%.1f %s"
msgstr "T:%.1f %s"
-#: divelist.c:1416
-#: print.c:510
-#: statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Datum"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Datum und Zeit"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Datum:"
@@ -507,7 +515,7 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Dez"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Standard XML Datei"
@@ -515,23 +523,19 @@ msgstr "Standard XML Datei"
msgid "Delete a dive computer information entry"
msgstr "Lösche die Informationen zu einem Tauchcomputer"
-#: divelist.c:2206
-#: divelist.c:2259
-#: divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Tauchgang löschen"
-#: divelist.c:2208
-#: divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Tauchgänge löschen"
-#: print.c:510
-#: statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Tiefe"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Tiefe (%s):"
@@ -540,7 +544,7 @@ msgstr "Tiefe (%s):"
msgid "Depth Limit Exceeded"
msgstr "Tiefenbegrenzung überschritten"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Tiefe:"
@@ -558,13 +562,12 @@ msgstr "Gerät oder Einhängepunkt"
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"
-#: info.c:157
-#: print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Tauchgang #%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Tauchgang Nr. %d: %s %d %04d"
@@ -573,9 +576,7 @@ msgstr "Tauchgang Nr. %d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Bezeichnung für den Tauchcomputer"
-#: gtk-gui.c:1607
-#: info.c:898
-#: statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Informationen"
@@ -583,11 +584,11 @@ msgstr "Informationen"
msgid "Dive Notes"
msgstr "Notizen"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr "Tauchplan - DIES IST NUR EINE SUMULATION; NICHT ZUM TAUCHEN VERWENDEN"
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Dauer"
@@ -603,11 +604,11 @@ msgstr "Info: Tauchgangsdauer"
msgid "Dive computer vendor and product"
msgstr "Tauchcomputer Hersteller und Modell"
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Fehler beim Importieren der Daten des Tauchgangs"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Notizen zum Tauchgang"
@@ -615,27 +616,27 @@ msgstr "Notizen zum Tauchgang"
msgid "Dive locations"
msgstr "Tauchplätze"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Tauchgruppenleiter"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr "Wann beginnt der Tauchgang?"
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Tauchgang Nr."
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Schriftart für Tauchliste"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Tauchgruppenleiter"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Tauchgänge"
@@ -663,28 +664,28 @@ msgstr "Vom Webserver laden..."
msgid "Download Success!"
msgstr "Erfolgreich geladen!"
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Dauer"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Dauer (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr "O"
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr "EAN%d"
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr "EAN32"
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr "EAN36"
@@ -700,11 +701,11 @@ msgstr "Gerätename bearbeiten"
msgid "Edit Dive Computer Nicknames"
msgstr "Tauchcomputer Bezeichnung bearbeiten"
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Reisen-Informationen bearbeiten"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Reisen-Übersicht bearbeiten"
@@ -712,37 +713,35 @@ msgstr "Reisen-Übersicht bearbeiten"
msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr "Der Name des Tauchcomputers kann mittels Doppelklick bearbeitet werden"
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Tauchgang bearbeiten"
-#: divelist.c:2405
-#: divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
msgid "Edit dive date/time"
msgstr "Zeit des Tauchgangs bearbeiten"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Tauchgänge bearbeiten"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Mehrere Tauchgänge bearbeiten"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Reisen-Übersicht bearbeiten"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Ereignisse Ein-/Ausblenden"
-#: equipment.c:949
-#: equipment.c:1456
+#: equipment.c:949 equipment.c:1456
msgid "End"
msgstr "Ende"
-#: planner.c:1139
+#: planner.c:1149
msgid "Ending Depth"
msgstr "Tiefe am Ende"
@@ -750,69 +749,68 @@ msgstr "Tiefe am Ende"
msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr "Benutzerkennung eingeben und 'Laden' drücken. Bei Erfolg 'Anwenden' drücken um die Daten zu übernehmen."
-#: gtk-gui.c:1603
-#: info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Ausrüstung"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr "Fehler beim Auswerten des Salzgehalts"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Fehler beim Analysieren des Datums"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Fehler beim Analysieren der Dauer"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Fehler beim Analysieren der Gas Informationen"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Fehler beim Analysieren der Gas Informationen"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Fehler beim Analysieren der maximalen Tiefe"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Fehler beim Auswerten der Samples"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Fehler bei der Registrierung der Abbruchbehandlung"
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Fehler beim Registrieren der Daten"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Fehler beim Registrieren der Ereignisbehandlung"
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Ereignis: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Ereignis: warte auf Benutzer Aktion"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Alle ausfalten"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Fehler beim Öffnen von %i Dateien"
@@ -827,12 +825,12 @@ msgstr "Fehler beim Analysieren von '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Fehler beim Analysieren von '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Fehler beim Lesen von '%s'.\n"
@@ -841,7 +839,7 @@ msgstr "Fehler beim Lesen von '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "Fuß"
@@ -861,47 +859,46 @@ msgstr "Erzwinge erneutes Laden aller Tauchgänge"
msgid "Fri"
msgstr "Fr"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr "GFhigh"
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr "GFhigh für Tauchplan"
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr "GFlow"
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr "GFlow für Tauchplan"
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (WGS84 oder GPS Format)"
-#: statistics.c:854
+#: statistics.c:857
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gasverbrauch"
-#: planner.c:1141
+#: planner.c:1151
msgctxt "Type of"
msgid "Gas Used"
msgstr "Verw. Gas"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr "Gasverbruach:\n"
-#: equipment.c:959
-#: print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Gasmischung"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr "Allg. Einstellungen"
@@ -921,7 +918,7 @@ msgstr "XML Datei(en) einlesen..."
msgid "Info"
msgstr "Informationen"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr "Verbindung aufbauen"
@@ -954,15 +951,11 @@ msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012, 2013"
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "Liter"
-#: divelist.c:1428
-#: info.c:606
-#: info.c:676
-#: info.c:1147
-#: print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Ort"
@@ -970,12 +963,12 @@ msgstr "Ort"
msgid "Log"
msgstr "Log"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Max."
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Längster Tauchgang"
@@ -999,7 +992,7 @@ msgstr "Hier markieren"
msgid "Marker"
msgstr "Markierung"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Leiter"
@@ -1007,20 +1000,19 @@ msgstr "Leiter"
msgid "Max Deco Time Warning"
msgstr "Warnung: Maximale Deko Zeit"
-#: statistics.c:797
-#: statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Max. Tiefe"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Max. AMV"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -1031,7 +1023,7 @@ msgstr ""
"Dauer: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr "Max. CNS"
@@ -1040,17 +1032,17 @@ msgstr "Max. CNS"
msgid "MaxPress"
msgstr "Max. Druck"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Max."
@@ -1059,50 +1051,50 @@ msgstr "Max."
msgid "May"
msgstr "Mai"
-#: divelist.c:2339
+#: divelist.c:2368
msgid "Merge dives"
msgstr "Tauchgänge zusammenführen"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Reise mit der darüber verbinden"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Reise mit der darunter verbinden"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "Meter"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Min. Tiefe"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Min. AMV"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Min. Temp."
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Verschiedene Optionen"
@@ -1118,7 +1110,7 @@ msgstr "Mo"
msgid "Multi-platform divelog software in C"
msgstr "Multi-Platform Tauchprogram in C"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr "N"
@@ -1126,7 +1118,7 @@ msgstr "N"
msgid "New"
msgstr "Neu"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Neue erste Nummer"
@@ -1134,8 +1126,7 @@ msgstr "Neue erste Nummer"
msgid "Next DC"
msgstr "Nächster TC"
-#: gtk-gui.c:1274
-#: gtk-gui.c:1999
+#: gtk-gui.c:1274 gtk-gui.c:1999
msgid "Nickname"
msgstr "Gerätename"
@@ -1143,9 +1134,7 @@ msgstr "Gerätename"
msgid "No Tank Data"
msgstr "Keine Flaschen Informationen"
-#: info.c:611
-#: info.c:725
-#: info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Notizen"
@@ -1157,10 +1146,7 @@ msgstr "Nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426
-#: gtk-gui.c:722
-#: print.c:363
-#: statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1169,7 +1155,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Unbekannter pthread Fehlercode"
@@ -1177,7 +1163,7 @@ msgstr "Unbekannter pthread Fehlercode"
msgid "Ok to delete the selected entry?"
msgstr "Ausgewählten Eintrag löschen?"
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Datei öffnen"
@@ -1185,7 +1171,7 @@ msgstr "Datei öffnen"
msgid "Open..."
msgstr "Öffnen..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr "Sauerstoff"
@@ -1206,11 +1192,11 @@ msgstr "Warnung: Aufstieg / PO2"
msgid "PO2 Green Warning"
msgstr "Warnung: PO2 Grün"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "psi"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr "Auf Karte auswählen"
@@ -1218,7 +1204,7 @@ msgstr "Auf Karte auswählen"
msgid "Planner"
msgstr "Planer"
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Einstellungen"
@@ -1226,12 +1212,11 @@ msgstr "Einstellungen"
msgid "Preferences..."
msgstr "Einstellungen..."
-#: equipment.c:938
-#: equipment.c:944
+#: equipment.c:938 equipment.c:944
msgid "Pressure"
msgstr "Druck"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Druck:"
@@ -1239,15 +1224,15 @@ msgstr "Druck:"
msgid "Prev DC"
msgstr "Vorh. TC"
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Nur ausgewählte Tauchgänge drucken"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Auswahl drucken"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Art des Ausdrucks"
@@ -1259,7 +1244,7 @@ msgstr "Drucken..."
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
msgid "Profile Settings"
msgstr "Profil Einstellungen"
@@ -1275,29 +1260,28 @@ msgstr "Alarm: verbleibende Gas-Zeit"
msgid "RGT Warning"
msgstr "Warnung: verbleibende Gas-Zeit"
-#: info.c:705
-#: info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Bewertung"
#: uemis-downloader.c:364
+#, c-format
msgid "Reading %s %s"
msgstr "Lese %s %s"
-#: divelist.c:2051
-#: divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Reise entfernen"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Tauchgang aus Reise entfernen"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Neu nummerieren"
@@ -1309,24 +1293,20 @@ msgstr "Neu nummerieren..."
msgid "Retry"
msgstr "Wiederholen"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr "S"
-#: divelist.c:1425
-#: gtk-gui.c:674
-#: print.c:410
-#: statistics.c:182
-#: statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "AMV"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr "AMV während Dekostopp"
-#: planner.c:1235
+#: planner.c:1257
msgid "SAC during dive"
msgstr "AMV während des Tauchgangs"
@@ -1346,23 +1326,28 @@ msgstr "Sa"
msgid "Save As..."
msgstr "Speichern unter..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Änderungen speichern?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Datei speichern unter"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Speichern unter..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Speichern..."
-#: planner.c:1140
+#: planner.c:1150
msgid "Segment Time"
msgstr "Segment Dauer"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
msgid "Select Events"
msgstr "Ereignisse auswählen"
@@ -1382,60 +1367,58 @@ msgstr ""
"Unvollständiger Schreibvorgang der req.txt Datei\n"
"Ist der Uemis Zürich korrekt verbunden?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Kürzester Tauchgang"
-#: gtk-gui.c:653
-#: gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Spalten anzeigen"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr "EAD, END, EADD anzeigen"
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr "MOD anzeigen"
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr "Berechnete tiefste Deko-Stopps anzeigen"
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr "Vom TC ausgelesene tiefste Deko-Stopps in rot anzeigen"
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr "Auf Karte zeigen"
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr "pHe Diagramm anzeigen"
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr "pN%s Diagramm anzeigen"
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr "pO%s Diagramm anzeigen"
-#: planner.c:191
+#: planner.c:192
msgid "Simulated Dive"
msgstr "Simulierter Tauchgang"
-#: equipment.c:935
-#: equipment.c:1453
+#: equipment.c:935 equipment.c:1453
msgid "Size"
msgstr "Größe"
@@ -1447,20 +1430,20 @@ msgstr "Alarm: Geschwindigkeit"
msgid "Speed Warning"
msgstr "Warnung: Geschwindigkeit"
-#: equipment.c:946
-#: equipment.c:1455
+#: equipment.c:946 equipment.c:1455
msgid "Start"
msgstr "Start"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr "Fange an zu laden"
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Statistiken"
-#: statistics.c:705
+#: statistics.c:708
+#, c-format
msgid "Statistics %s"
msgstr "Statistiken %s"
@@ -1472,26 +1455,12 @@ msgstr "Statistiken"
msgid "Status"
msgstr "Status"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s\n"
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-"Subsurface Tauchplan\n"
-"basierend auf GFlow = %.0f und GFhigh = %.0f\n"
-"\n"
-
-#: divelist.c:1422
-#: gtk-gui.c:684
-#: info.c:706
-#: info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Anzug"
@@ -1500,20 +1469,20 @@ msgstr "Anzug"
msgid "Sun"
msgstr "So"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Oberflächenpause"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr "Druck an der Oberfläche (mbar)"
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr "Gaswechsel zu %s\n"
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Tabellenausdruck"
@@ -1525,19 +1494,19 @@ msgstr "Flaschenwechsel Vorschlag"
msgid "Tank Pressure Info"
msgstr "Info: Flaschendruck"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr "Tec Einstellungen"
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temperatur"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Temperatur:"
@@ -1549,8 +1518,7 @@ msgstr "Drei"
msgid "Thu"
msgstr "Do"
-#: info.c:1016
-#: print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Zeit"
@@ -1566,20 +1534,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Zoom ein-/ausschalten"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Gesamt"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Gesamtzeit"
-#: print.c:336
+#: print.c:321
+#, c-format
msgid "Total Weight:"
msgstr "Gesamtgewicht:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Auftauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s\n"
@@ -1596,8 +1565,7 @@ msgstr[1] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)"
msgid "Tue"
msgstr "Di"
-#: equipment.c:1452
-#: equipment.c:1480
+#: equipment.c:1452 equipment.c:1480
msgid "Type"
msgstr "Typ"
@@ -1621,25 +1589,25 @@ msgstr ""
"Bitte den Tauchcomputer ausstecken und wieder einstecken\n"
"und erneut versuchen"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Uemis Initialisierung fehlgeschlagen"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Fehler beim Erzeugen des libdivecomputer Contexts"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Nicht in der Lage, einen Parser für %s %s zu erstellen"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Fehler beim Öffnen von %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Einheiten"
@@ -1651,20 +1619,19 @@ msgstr "Benutzerkennung"
msgid "View"
msgstr "Ansicht"
-#: info.c:711
-#: statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr "Sicht"
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Volumen:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr "W"
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Wassertemperatur"
@@ -1676,32 +1643,28 @@ msgstr "Webservice"
msgid "Wed"
msgstr "Mi"
-#: equipment.c:985
-#: equipment.c:1579
-#: gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Gewicht"
-#: equipment.c:1084
-#: print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Gewicht"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Gewicht:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML Datei"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Jahr"
-#: gtk-gui.c:1371
-#: statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Jährliche Statistiken"
@@ -1718,7 +1681,7 @@ msgstr ""
"Subsurface kann einen Namen für dieses Gerät verwalten um die Geräte zu unterscheiden. Die Voreinstellung ist unten angezeigt.\n"
"Falls kein Name gewünscht ist, bitte 'Abbrechen' klicken. Subsurface zeigt dann einfach den Produktnamen an (in diesem Fall können eventuell verschiedene Tauchcomputer nicht mehr in den angezeigten Daten unterschieden werden)."
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1726,8 +1689,7 @@ msgstr ""
"Nicht alle Änderungen wurden gespeichert.\n"
"Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
-#: gtk-gui.c:211
-#: gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1736,10 +1698,7 @@ msgstr ""
"Nicht alle Änderungen in der Dati %s wurden gespeichert.\n"
"Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
-#: divelist.c:544
-#: planner.c:74
-#: planner.c:725
-#: print.c:183
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
#: profile.c:399
#, c-format
msgid "air"
@@ -1785,8 +1744,7 @@ msgstr "Sicherheits-Stopp"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91
-#: planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "cu.ft."
@@ -1818,36 +1776,36 @@ msgstr "Dauer"
msgid "drysuit"
msgstr "Trockentauchanzug"
-#: planner.c:727
+#: planner.c:734
msgid "ean"
msgstr "ean"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr "für alle Tauchgänge"
-#: statistics.c:674
+#: statistics.c:677
+#, c-format
msgid "for dive #%d"
msgstr "für Tauchgang Nr.%d"
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr "für Tauchgänge Nr."
-#: statistics.c:676
+#: statistics.c:679
+#, c-format
msgid "for selected dive"
msgstr "für den ausgewählten Tauchgang"
-#: statistics.c:640
+#: statistics.c:643
+#, c-format
msgid "for selected dives"
msgstr "für die ausgewählten Tauchgänge"
-#: dive.c:117
-#: divelist.c:1418
-#: info.c:1078
-#: planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1855,8 +1813,7 @@ msgstr "ft"
msgid "full suit"
msgstr "voller Tauchanzug"
-#: libdivecomputer.c:151
-#: libdivecomputer.c:154
+#: libdivecomputer.c:151 libdivecomputer.c:154
msgid "gaschange"
msgstr "Flaschenwechsel"
@@ -1876,9 +1833,7 @@ msgstr "ungültige Ereignisnummer"
msgid "jacket"
msgstr "Jacke"
-#: dive.c:141
-#: equipment.c:1004
-#: gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1886,10 +1841,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137
-#: divelist.c:1421
-#: equipment.c:1006
-#: gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "US Pfund"
@@ -1897,17 +1849,15 @@ msgstr "US Pfund"
msgid "long john"
msgstr "Latzhose"
-#: dive.c:112
-#: info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr "max. ppO2"
-#: divelist.c:1427
-#: gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr "max. CNS"
@@ -1919,12 +1869,11 @@ msgstr "Max. Tiefe"
msgid "membrane"
msgstr "Membran"
-#: divelist.c:1419
-#: planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
@@ -1933,7 +1882,7 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgid "more data dive id"
msgstr "mehr Daten für Tauchgang ID"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "mehr als %d Tage"
@@ -1946,16 +1895,16 @@ msgstr "No-Stopp Zeit"
msgid "none"
msgstr "keine"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr "pHe Schwelle"
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr "pN%s Schwelle"
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr "pO%s Schwelle"
@@ -2013,16 +1962,11 @@ msgstr "Dirk Hohndel"
msgid "transmitter"
msgstr "Sender"
-#: equipment.c:1345
-#: equipment.c:1365
+#: equipment.c:1345 equipment.c:1365
msgid "unkn"
msgstr "unbk"
-#: libdivecomputer.c:152
-#: print.c:317
-#: statistics.c:563
-#: statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "unbekannt"
@@ -2050,6 +1994,9 @@ msgstr "Nass-Tauchanzug"
msgid "workload"
msgstr "Arbeit"
+#~ msgid "1 dive per page"
+#~ msgstr "1 Tauchgang pro Seite"
+
#~ msgid "About"
#~ msgstr "Info"
@@ -2058,16 +2005,16 @@ msgstr "Arbeit"
#~ msgid "Delete"
#~ msgstr "Löschen"
-#~ msgctxt "Depth"
+#~ msgctxt "Depth"
#~ msgid ""
#~ "Depth\n"
#~ "Average"
#~ msgstr ""
#~ "Tiefe\n"
#~ "Ø"
-#~ msgctxt "Duration"
+#~ msgctxt "Duration"
#~ msgid ""
#~ "Duration\n"
#~ "Total"
@@ -2080,8 +2027,8 @@ msgstr "Arbeit"
#~ msgid "Pretty print"
#~ msgstr "Schön drucken"
-#~ msgctxt "SAC"
+#~ msgctxt "SAC"
#~ msgid ""
#~ "SAC\n"
#~ "Average"
@@ -2096,8 +2043,8 @@ msgstr "Arbeit"
#~ msgstr ""
#~ "\n"
#~ "Min."
-#~ msgctxt "Temp"
+#~ msgctxt "Temp"
#~ msgid ""
#~ "Temperature\n"
#~ "Average"
diff --git a/po/es_ES.po b/po/es_ES.po
index 1c007d67e..2b6e76533 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: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2012-10-22 07:55-0300\n"
"Last-Translator: Sergio Schvezov <sergiusens@ieee.org>\n"
"Language-Team: Spanish\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr "> Mes"
@@ -32,48 +32,48 @@ msgstr ""
msgid " Please select dive computer and device. "
msgstr " Por favor, seleccione el ordenador de buceo y el dispositivo."
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr ""
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "#"
-#: print.c:322
+#: print.c:307
#, fuzzy, c-format
msgid "%.*f %s"
msgstr "%.*f %s/min"
-#: print.c:267 print.c:340
+#: print.c:252 print.c:325
#, fuzzy, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s/min"
-#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr ""
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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:584
+#: print.c:575
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr ""
@@ -85,60 +85,60 @@ 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:551
+#: statistics.c:549
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr ""
-#: print.c:609 statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d minutos"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd, %dh %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dh %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr ""
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
"CNS:%u%%"
msgstr ""
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
"Calculated ceiling %.0f %s"
msgstr ""
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
"Deco:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
"Deco:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -147,82 +147,91 @@ msgid ""
"EADD:%d%s"
msgstr ""
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
"In deco"
msgstr ""
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
"MOD:%d%s"
msgstr ""
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
"NDL:%umin"
msgstr ""
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
"P:%d %s"
msgstr ""
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
"Safetystop:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
"Safetystop:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2107
+#: planner.c:468
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
"T:%.1f %s"
msgstr ""
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
"pHe:%.2fbar"
msgstr ""
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
"pN%s:%.2fbar"
msgstr ""
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
"pO%s:%.2fbar"
msgstr ""
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) o (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, fuzzy, c-format
msgid "(no dives)"
msgstr "Editar inmersiones"
@@ -231,53 +240,49 @@ msgstr "Editar inmersiones"
msgid "(nothing)"
msgstr ""
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr ""
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr ""
-#: print.c:907
-msgid "1 dive per page"
+#: planner.c:1253
+msgid "17 l/min"
msgstr ""
-#: planner.c:1231
-msgid "17 l/min"
+#: print.c:924
+msgid "2 dives per page"
msgstr ""
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr ""
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr ""
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr ""
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr ""
-#: planner.c:1203
+#: planner.c:1197
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given "
-"depth, takes the given time (if relative, e.g. '+3:30') or ends at the given "
-"time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
-"An entry that has a depth and a gas given but no time is special; it informs "
-"the planner that the gas specified is available for the ascent once the "
-"depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr ""
@@ -289,28 +294,28 @@ msgstr "Sobre Subsurface"
msgid "Add Dive..."
msgstr "Añadir inmersión ..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Añadir inmersión"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Añadir al viaje anterior"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr ""
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr ""
-#: statistics.c:844
+#: statistics.c:847
#, fuzzy
msgid "Air Temp"
msgstr "Temp media"
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr ""
@@ -331,64 +336,64 @@ msgstr "Aug"
msgid "Autogroup"
msgstr "Auto Agrupar"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Media"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Media"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Promedio"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Media"
-#: statistics.c:799 statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Profundidad media"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "SAC medio"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Temp media"
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Media de tiempo"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr ""
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "Bar"
-#: info.c:700 info.c:1153 print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Compañero"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr ""
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr ""
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr ""
@@ -396,11 +401,11 @@ msgstr ""
msgid "Cannot parse response!"
msgstr ""
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Seleccionar archivo XML predeterminado"
@@ -412,7 +417,7 @@ msgstr "Elegir archivos XML para importar en archivo de datos actual"
msgid "Close"
msgstr "Cerrar"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Contraer todo"
@@ -424,19 +429,19 @@ msgstr ""
msgid "Connection Error: "
msgstr ""
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Crear nuevo viaje por encima"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "pie^3"
-#: divelist.c:1423 gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Bot"
-#: equipment.c:918 equipment.c:1029 print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Botella"
@@ -444,20 +449,24 @@ msgstr "Botella"
msgid "Cylinders"
msgstr "Botellas"
-#: profile.c:2098
+#: profile.c:2102
#, fuzzy, c-format
msgid "D:%.1f %s"
msgstr "%.*f %s/min"
-#: divelist.c:1416 print.c:510 statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Fecha"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Fecha y hora"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Fecha:"
@@ -465,7 +474,7 @@ msgstr "Fecha:"
msgid "Dec"
msgstr "Dic"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Archivo XML por defecto"
@@ -473,19 +482,19 @@ msgstr "Archivo XML por defecto"
msgid "Delete a dive computer information entry"
msgstr ""
-#: divelist.c:2206 divelist.c:2259 divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Eliminar inmersión"
-#: divelist.c:2208 divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Eliminar inmersiones"
-#: print.c:510 statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Profundidad"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Profundidad (%s):"
@@ -494,7 +503,7 @@ msgstr "Profundidad (%s):"
msgid "Depth Limit Exceeded"
msgstr "Superado límite de profundidad"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Profundidad:"
@@ -513,12 +522,12 @@ msgstr ""
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Inmersión #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-#: info.c:157 print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Inmersión #%d -"
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Inmersión #%d:%s %d %04d"
@@ -528,7 +537,7 @@ msgstr "Inmersión #%d:%s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Ordenador de Buceo"
-#: gtk-gui.c:1607 info.c:898 statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Información de la inmersión"
@@ -536,11 +545,11 @@ msgstr "Información de la inmersión"
msgid "Dive Notes"
msgstr "Notas de la inmersión"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr ""
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Duración de la inmersión"
@@ -556,11 +565,11 @@ msgstr "Información sobre la ruración de lainmersión"
msgid "Dive computer vendor and product"
msgstr ""
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Error al importar datos de inmersiones"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Detalles de la inmersión"
@@ -569,27 +578,27 @@ msgstr "Detalles de la inmersión"
msgid "Dive locations"
msgstr "Notas de la inmersión"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Guía"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr ""
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Inmersión #"
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Fuente de lista de inmersiones"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Inmersiones"
@@ -620,28 +629,28 @@ msgstr "Descargar desde el ordenador de Buceo..."
msgid "Download Success!"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Duración"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Duración (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr ""
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr ""
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr ""
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr ""
@@ -658,42 +667,40 @@ msgstr "Nombre del dispositivo"
msgid "Edit Dive Computer Nicknames"
msgstr ""
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Editar el viaje"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Editar resumen del viaje"
#: gtk-gui.c:1302
-msgid ""
-"Edit a dive computer nickname by double-clicking the in the relevant "
-"nickname field"
+msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr ""
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Editar inmersión"
-#: divelist.c:2405 divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
#, fuzzy
msgid "Edit dive date/time"
msgstr "Editar inmersión"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Editar inmersiones"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Editar múltiples inmersiones"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Editar resumen del viaje"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Activar / Desactivar eventos"
@@ -701,80 +708,78 @@ msgstr "Activar / Desactivar eventos"
msgid "End"
msgstr "Fin"
-#: planner.c:1139
+#: planner.c:1149
#, fuzzy
msgid "Ending Depth"
msgstr "Profundidad mínima"
#: webservice.c:220
-msgid ""
-"Enter a user identifier and press 'Download'. Once the download is complete "
-"you can press 'Apply' if you wish to apply the changes."
+msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr ""
-#: gtk-gui.c:1603 info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Equipo"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
#, fuzzy
msgid "Error obtaining water salinity"
msgstr "Error al analizar las muestras"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Error al analizar la fecha"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Error al analizar el tiempo de buceo"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Error al analizar la mezcla de gas"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Error al analizar el conteo de mezcla de gas"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Error al analizar la máxima profundidad"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Error al analizar las muestras"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Error al registrar el manejador de cancelación"
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Error al registrar los datos"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Error al registrar el manejador de eventos"
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr ""
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Evento: aguardando acción del usuario"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Expandir todos"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "No se pudo abrir los %i archivos."
@@ -789,12 +794,12 @@ msgstr "No se pudo analizar '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "No se pudo analizar '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "No se pudo leer '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "No se pudo leer '%s'.\n"
@@ -803,7 +808,7 @@ msgstr "No se pudo leer '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "Pies"
@@ -823,48 +828,48 @@ msgstr ""
msgid "Fri"
msgstr "Vi"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr ""
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr ""
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr ""
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr ""
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr ""
-#: statistics.c:854
+#: statistics.c:857
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gas usado"
-#: planner.c:1141
+#: planner.c:1151
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gas usado"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr ""
-#: equipment.c:959 print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Mezcla de gas"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr ""
@@ -884,7 +889,7 @@ msgstr "Importar Archivo(s) XML..."
msgid "Info"
msgstr "Info"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr ""
@@ -918,11 +923,11 @@ msgstr "Linus Torvalds, Dirk Hohndel y otros, 2011, 2012"
msgid "List"
msgstr "Lista"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "Litro"
-#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Ubicación"
@@ -930,12 +935,12 @@ msgstr "Ubicación"
msgid "Log"
msgstr "Log"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Más Prolongado"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Inmersión más prolongada"
@@ -959,7 +964,7 @@ msgstr ""
msgid "Marker"
msgstr "Marcador"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Guía"
@@ -967,19 +972,19 @@ msgstr "Guía"
msgid "Max Deco Time Warning"
msgstr "Advertencia de tiempo max deco"
-#: statistics.c:797 statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Profundidad max"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Max SAC"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Max. Temp."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -990,7 +995,7 @@ msgstr ""
"Duración :%d minutos\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr ""
@@ -999,17 +1004,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Pres. max."
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Máxima"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Máximo"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Máxima"
@@ -1018,51 +1023,51 @@ msgstr "Máxima"
msgid "May"
msgstr "Mayo"
-#: divelist.c:2339
+#: divelist.c:2368
#, fuzzy
msgid "Merge dives"
msgstr "Eliminar inmersiones"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Combinar viaje con el viaje de encima"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Combinar viaje con el viaje de abajo"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "Metro"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Profundidad mínima"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Min SAC"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Min Temp"
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Mínima"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Mínimo"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Mínima"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Opciones Varias"
@@ -1078,7 +1083,7 @@ msgstr "Lu"
msgid "Multi-platform divelog software in C"
msgstr "Software multi-plataforma escrito en C para DiveLog"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr ""
@@ -1086,7 +1091,7 @@ msgstr ""
msgid "New"
msgstr "Nuevo"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Nuevo número de partida"
@@ -1103,7 +1108,7 @@ msgstr "Nombre del dispositivo"
msgid "No Tank Data"
msgstr "No se degistran datos de botella"
-#: info.c:611 info.c:725 info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Notas"
@@ -1115,7 +1120,7 @@ msgstr "Nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1124,7 +1129,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "Oct"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Error de lectura"
@@ -1132,7 +1137,7 @@ msgstr "Error de lectura"
msgid "Ok to delete the selected entry?"
msgstr ""
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Abrir archivo"
@@ -1140,7 +1145,7 @@ msgstr "Abrir archivo"
msgid "Open..."
msgstr "Abrir..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr ""
@@ -1161,11 +1166,11 @@ msgstr "Aviso de Ascenso PpO2"
msgid "PO2 Green Warning"
msgstr "Aviso Verde PpO2"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "PSI"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr ""
@@ -1173,7 +1178,7 @@ msgstr ""
msgid "Planner"
msgstr ""
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Preferencias"
@@ -1185,7 +1190,7 @@ msgstr "Preferencias..."
msgid "Pressure"
msgstr "Presión"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Presión:"
@@ -1193,15 +1198,15 @@ msgstr "Presión:"
msgid "Prev DC"
msgstr ""
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Imprimir sólo inmersiones seleccionadas"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Imprimir selección"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Tipo de impresión"
@@ -1213,7 +1218,7 @@ msgstr "Imprimir..."
msgid "Profile"
msgstr "Perfil"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
#, fuzzy
msgid "Profile Settings"
msgstr "Perfil"
@@ -1230,7 +1235,7 @@ msgstr "Alerta tiempo de gas restante"
msgid "RGT Warning"
msgstr "Aviso tiempo de gas restante"
-#: info.c:705 info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Valoración"
@@ -1239,19 +1244,19 @@ msgstr "Valoración"
msgid "Reading %s %s"
msgstr "Leyendo inmersiones %s"
-#: divelist.c:2051 divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Eliminar viaje"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Eliminar inmersión del viaje"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Eliminar selección de inmersiones del viaje"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Renumerar"
@@ -1263,20 +1268,20 @@ msgstr "Renumerar..."
msgid "Retry"
msgstr "Intentar de nuevo"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr ""
-#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "SAC"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr ""
-#: planner.c:1235
+#: planner.c:1257
#, fuzzy
msgid "SAC during dive"
msgstr "Añadir inmersión"
@@ -1297,24 +1302,29 @@ msgstr "Sa"
msgid "Save As..."
msgstr "Guardar como..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "¿Guardar cambios?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Guardar Archivo Como"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Guardar como..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Guardar..."
-#: planner.c:1140
+#: planner.c:1150
#, fuzzy
msgid "Segment Time"
msgstr "Media de tiempo"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
#, fuzzy
msgid "Select Events"
msgstr "Seleccionar eventos"
@@ -1336,54 +1346,54 @@ msgstr ""
"Escritura corta al archivo req.txt \n"
"¿Está el Zúrich Uemis correctamente conectado?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Más corta"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Inmersión más corta"
-#: gtk-gui.c:653 gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Mostrar Columnas"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr ""
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr ""
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr ""
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr ""
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr ""
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr ""
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr ""
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr ""
-#: planner.c:191
+#: planner.c:192
#, fuzzy
msgid "Simulated Dive"
msgstr "Eliminar inmersión"
@@ -1404,15 +1414,15 @@ msgstr "Advertencia de velocidad`"
msgid "Start"
msgstr "Inicio"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr ""
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Estadísticas"
-#: statistics.c:705
+#: statistics.c:708
#, fuzzy, c-format
msgid "Statistics %s"
msgstr "Estadísticas"
@@ -1426,20 +1436,12 @@ msgstr "Estadísticas"
msgid "Status"
msgstr "Estadísticas"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-
-#: divelist.c:1422 gtk-gui.c:684 info.c:706 info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Traje"
@@ -1448,20 +1450,20 @@ msgstr "Traje"
msgid "Sun"
msgstr "Do"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Interv. Superf."
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr ""
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr ""
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Impresión de tabla"
@@ -1473,19 +1475,19 @@ msgstr "Sugerencia de cambio de botella"
msgid "Tank Pressure Info"
msgstr "Información sobre presión de botella"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr ""
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temp"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Temperatura"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Temperatura"
@@ -1497,7 +1499,7 @@ msgstr "Todo"
msgid "Thu"
msgstr "Ju"
-#: info.c:1016 print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Tiempo"
@@ -1511,21 +1513,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Activar / Desactivar Zoom"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Tiempo total"
-#: print.c:336
+#: print.c:321
#, fuzzy, c-format
msgid "Total Weight:"
msgstr "Peso:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
@@ -1567,25 +1569,25 @@ msgstr ""
"Desconectar / conectar el ordenador de buceo\n"
"e inténtelo de nuevo"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Fallo al intentar iniciar Uemis"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "No es posible crear el contexto de libdivecomputer"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "No es posible crear el analizador para %s %s"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "No se pudo abrir %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Unidades"
@@ -1597,19 +1599,19 @@ msgstr ""
msgid "View"
msgstr "Ver"
-#: info.c:711 statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr ""
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Volumen:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr ""
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Temp. de Agua"
@@ -1621,28 +1623,28 @@ msgstr ""
msgid "Wed"
msgstr "Mi"
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Peso"
-#: equipment.c:1084 print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Sistema de lastre"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Peso:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML archivo"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Año"
-#: gtk-gui.c:1371 statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Estadísticas anuales"
@@ -1651,14 +1653,11 @@ msgstr "Estadísticas anuales"
msgid ""
"You already have a dive computer of this model\n"
"named %s\n"
-"Subsurface can maintain a nickname for this device to distinguish it from "
-"the existing one. The default is the model and device ID as shown below.\n"
-"If you don't want to name this dive computer click 'Cancel' and Subsurface "
-"will simply display its model as its name (which may mean that you cannot "
-"tell the two dive computers apart in the logs)."
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
msgstr ""
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1666,7 +1665,7 @@ msgstr ""
"Has guardado los cambios \n"
"¿Te gustaría guardar los cambios antes de cerrar el archivo de datos?"
-#: gtk-gui.c:211 gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1675,7 +1674,8 @@ msgstr ""
"Tienes cambios sin guardar en el archivo: %s \n"
"¿Te gustaría guardar los cambios antes de cerrar el archivo de datos?"
-#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
+#: profile.c:399
#, c-format
msgid "air"
msgstr "aire"
@@ -1720,7 +1720,7 @@ msgstr "techo (parada de seguridad)"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91 planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "pie^3"
@@ -1753,37 +1753,37 @@ msgstr "duración de inmersión"
msgid "drysuit"
msgstr ""
-#: planner.c:727
+#: planner.c:734
#, fuzzy
msgid "ean"
msgstr "Ene"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr ""
-#: statistics.c:674
+#: statistics.c:677
#, fuzzy, c-format
msgid "for dive #%d"
msgstr "Inmersión #%d -"
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr ""
-#: statistics.c:676
+#: statistics.c:679
#, fuzzy, c-format
msgid "for selected dive"
msgstr "Imprimir sólo inmersiones seleccionadas"
-#: statistics.c:640
+#: statistics.c:643
#, fuzzy, c-format
msgid "for selected dives"
msgstr "Imprimir sólo inmersiones seleccionadas"
-#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "pies"
@@ -1811,7 +1811,7 @@ msgstr "Número de evento inválido"
msgid "jacket"
msgstr ""
-#: dive.c:141 equipment.c:1004 gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1819,7 +1819,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "libra"
@@ -1827,15 +1827,15 @@ msgstr "libra"
msgid "long john"
msgstr ""
-#: dive.c:112 info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr ""
-#: divelist.c:1427 gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr ""
@@ -1847,11 +1847,11 @@ msgstr "Profundidad Max"
msgid "membrane"
msgstr ""
-#: divelist.c:1419 planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "modelo=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
@@ -1861,7 +1861,7 @@ msgstr "modelo=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgid "more data dive id"
msgstr "más de %d días"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "más de %d días"
@@ -1874,16 +1874,16 @@ msgstr ""
msgid "none"
msgstr "ninguno"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr ""
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr ""
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr ""
@@ -1951,8 +1951,7 @@ msgstr "transmisor"
msgid "unkn"
msgstr "desc"
-#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "desconocido"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 2f78f72f3..b22186166 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: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2013-02-04 19:01+0200\n"
"Last-Translator: Miika Turkia <miika.turkia@gmail.com>\n"
"Language-Team: Finnish\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Kuukausi"
@@ -32,52 +32,48 @@ msgstr "Lataa"
msgid " Please select dive computer and device. "
msgstr "Valitse sukellustietokone ja laitenimi."
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr ""
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "#"
-#: print.c:322
+#: print.c:307
#, fuzzy, c-format
msgid "%.*f %s"
msgstr "%.*f %s/min"
-#: print.c:267
-#: print.c:340
+#: print.c:252 print.c:325
#, fuzzy, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s/min"
-#: statistics.c:588
-#: statistics.c:735
-#: statistics.c:737
-#: statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, fuzzy, c-format
msgid "%.0f%s of %s\n"
msgstr "%.0f %s (%s)\n"
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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$skuuta %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:584
+#: print.c:575
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s, %3$d. %2$skuuta %4$d, %5$d:%6$02d"
@@ -89,33 +85,32 @@ msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s %3$d. %2$skuuta %4$d %5$2d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:551
+#: statistics.c:549
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s, %3$d. %2$skuuta %4$d, %5$d:%6$02d"
-#: print.c:609
-#: statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%d pv %d t %d min"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%d t %d min"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr "%s"
-#: profile.c:2144
+#: profile.c:2148
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -124,7 +119,7 @@ msgstr ""
"%s\n"
"CNS: %u %%"
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
@@ -133,7 +128,7 @@ msgstr ""
"%s\n"
"Laskettu katto %.0f %s"
-#: profile.c:2128
+#: profile.c:2132
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -142,7 +137,7 @@ msgstr ""
"%s\n"
"Deco: %u min @ %.0f %s"
-#: profile.c:2131
+#: profile.c:2135
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -151,7 +146,7 @@ msgstr ""
"%s\n"
"Deco: tuntem. aika @ %.0f %s"
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -164,14 +159,14 @@ msgstr ""
"END: %d %s\n"
"EADD: %d %s"
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
"In deco"
msgstr ""
-#: profile.c:2161
+#: profile.c:2165
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -180,7 +175,7 @@ msgstr ""
"%s\n"
"MOD: %d %s"
-#: profile.c:2140
+#: profile.c:2144
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -189,7 +184,7 @@ msgstr ""
"%s\n"
"NDL: %u min"
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
@@ -198,7 +193,7 @@ msgstr ""
"%s\n"
"P: %d %s"
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
@@ -207,7 +202,7 @@ msgstr ""
"%s\n"
"Turvapysähdys: %u min @ %.0f %s"
-#: profile.c:2123
+#: profile.c:2127
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -216,7 +211,19 @@ msgstr ""
"%s\n"
"Turvapysähdys: tuntemat. aika @ %.0f %s"
-#: profile.c:2107
+#: planner.c:468
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+"Subsurfacen laskema sukellussuunnitelma\n"
+"perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f\n"
+"\n"
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
@@ -225,7 +232,7 @@ msgstr ""
"%s\n"
"T: %.1f %s"
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
@@ -234,7 +241,7 @@ msgstr ""
"%s\n"
"pHe: %.2f bar"
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
@@ -243,7 +250,7 @@ msgstr ""
"%s\n"
"pN%s: %.2f bar"
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
@@ -252,12 +259,12 @@ msgstr ""
"%s\n"
"pO%s: %.2f bar"
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) tai (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, c-format
msgid "(no dives)"
msgstr "(ei sukelluksia)"
@@ -266,47 +273,49 @@ msgstr "(ei sukelluksia)"
msgid "(nothing)"
msgstr "(ei mitään)"
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr ""
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr ""
-#: print.c:907
-msgid "1 dive per page"
-msgstr "Yksi sukellus sivulle"
-
-#: planner.c:1231
+#: planner.c:1253
msgid "17 l/min"
msgstr "17 l/min"
+#: print.c:924
+#, fuzzy
+msgid "2 dives per page"
+msgstr "Kuusi sukellusta sivulle"
+
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr "Kaksiosainen kokopuku"
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr "20 l/min"
-#: gtk-gui.c:833
+#: gtk-gui.c:837
#, fuzzy
msgid "3m increments for calculated ceiling"
msgstr "Kolmen metrin portaat laskennalliselle kattosyvyydelle"
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr "Kuusi sukellusta sivulle"
-#: planner.c:1203
+#: planner.c:1197
+#, fuzzy
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
"<small>Syötä suunnitellun sukelluksen vaiheet alla olevaan listaan.\n"
"Kukin rivi kuvaa yhtä sukelluksen vaihetta, joka päättyy annettuun syvyyteen ja aikaan sekä käyttää annettua kaasua. Aika voidaan määritellä joko suhteellisena edellisen vaiheen päättymisestä (+3:30) tai absoluuttisena sukelluksen alusta (3:30).\n"
@@ -314,12 +323,11 @@ msgstr ""
"Voit määritellä nousun automaattiselle suunnittelulle kaasun, joka otetaan käyttöön tietyllä syvyydellä. Jätä tällöin vaiheen kesto tyhjäksi ja syötä syvyys ja kaasu normaalisti.\n"
"Saraketta CC käytetään ainoastaan suljetun kierron sukelluslaitteiden kanssa. Jos käytät avoimen kierron laitteita, jätä sarake tyhjäksi.</small>"
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr "Ilma"
-#: gtk-gui.c:1054
-#: gtk-gui.c:1377
+#: gtk-gui.c:1054 gtk-gui.c:1377
msgid "About Subsurface"
msgstr "Tietoja Subsurfacesta"
@@ -327,28 +335,28 @@ msgstr "Tietoja Subsurfacesta"
msgid "Add Dive..."
msgstr "Lisää sukellus..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Lisää sukellus"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Liitä yllä olevaan retkeen"
-#: planner.c:1250
+#: planner.c:1272
#, fuzzy
msgid "Add waypoint"
msgstr "Lisää uusi jakso"
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr "Ilmanpaine"
-#: statistics.c:844
+#: statistics.c:847
msgid "Air Temp"
msgstr "Ilman lämpötila"
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr "Ilman lämpötila (%s)"
@@ -369,68 +377,65 @@ msgstr "elo"
msgid "Autogroup"
msgstr "Automaattinen ryhmittely"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Keskim."
-#: statistics.c:799
-#: statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Keskisyvyys"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Pintakulutus"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Keskilämpötila"
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Keskipituus"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr ""
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "bar"
-#: info.c:700
-#: info.c:1153
-#: print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Sukelluspari"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr ""
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
#, fuzzy
msgid "Cancelled, exiting cleanly..."
msgstr "Peruutettu, poistutaan..."
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr "Peruttu..."
@@ -438,11 +443,11 @@ msgstr "Peruttu..."
msgid "Cannot parse response!"
msgstr "Vastauksen jäsentäminen ei onnistu!"
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Valitse oletustiedosto"
@@ -454,7 +459,7 @@ msgstr "Valitse tietoihin liitettävät XML-tiedostot"
msgid "Close"
msgstr "Sulje"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Supista kaikki retket"
@@ -466,22 +471,19 @@ msgstr "Yhdistetään..."
msgid "Connection Error: "
msgstr "Yhteysvirhe:"
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Liitä uuteen retkeen"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "kuutiojalka"
-#: divelist.c:1423
-#: gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Säiliöt"
-#: equipment.c:918
-#: equipment.c:1029
-#: print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Säiliöt"
@@ -489,22 +491,24 @@ msgstr "Säiliöt"
msgid "Cylinders"
msgstr "Säiliöt"
-#: profile.c:2098
+#: profile.c:2102
#, fuzzy, c-format
msgid "D:%.1f %s"
msgstr "%.*f %s/min"
-#: divelist.c:1416
-#: print.c:510
-#: statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Ajankohta"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Päivä ja aika"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Päivä:"
@@ -512,7 +516,7 @@ msgstr "Päivä:"
msgid "Dec"
msgstr "joulu"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Oletustiedosto"
@@ -520,23 +524,19 @@ msgstr "Oletustiedosto"
msgid "Delete a dive computer information entry"
msgstr "Poista sukellustietokoneen tiedot"
-#: divelist.c:2206
-#: divelist.c:2259
-#: divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Poista sukellus"
-#: divelist.c:2208
-#: divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Poista sukellukset"
-#: print.c:510
-#: statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Syvyys"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Syvyys (%s):"
@@ -545,7 +545,7 @@ msgstr "Syvyys (%s):"
msgid "Depth Limit Exceeded"
msgstr "Syvyysraja ylitetty"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Syvyys:"
@@ -564,13 +564,12 @@ msgstr "Laite- tai hakemistopolku"
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Sukellus #%1$d - %2$s %4$d.%3$d.%5$04d, %6$d:%7$02d"
-#: info.c:157
-#: print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Sukellus #%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Sukellus %1$d: %3$d. %2$skuuta %4$04d"
@@ -580,9 +579,7 @@ msgstr "Sukellus %1$d: %3$d. %2$skuuta %4$04d"
msgid "Dive Computer Nickname"
msgstr "Sukellustietokone"
-#: gtk-gui.c:1607
-#: info.c:898
-#: statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Tiedot"
@@ -590,11 +587,11 @@ msgstr "Tiedot"
msgid "Dive Notes"
msgstr "Muistiinpanot"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr "Sukelluksen suunnittelu - TÄMÄ ON SIMULAATIO; ÄLÄ KÄYTÄ SUKELLUKSEEN"
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Sukellusaika"
@@ -610,11 +607,11 @@ msgstr "Tiedotus: sukellusaika"
msgid "Dive computer vendor and product"
msgstr "Sukellustietokoneen valmistaja ja laite"
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Virhe sukellusten jäsentämisessä"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Tiedot"
@@ -622,27 +619,27 @@ msgstr "Tiedot"
msgid "Dive locations"
msgstr "Sukelluskohde"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Sukellusvanhin"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr "Aloitusaika"
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Sukellus"
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Sukelluslistan kirjasin"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Sukellusvanhin"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Sukelluskerrat"
@@ -670,28 +667,28 @@ msgstr "Hae verkkopalvelusta..."
msgid "Download Success!"
msgstr "Lataus onnistui!"
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Kesto"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Kesto (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr ""
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr "EAN%d"
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr "EAN32"
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr "EAN36"
@@ -707,11 +704,11 @@ msgstr "Muokkaa laitenimeä"
msgid "Edit Dive Computer Nicknames"
msgstr "Muokkaa sukellustietokoneiden lempinimiä"
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Muuta retken tietoja"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Muuta retken tietoja"
@@ -719,37 +716,35 @@ msgstr "Muuta retken tietoja"
msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr "Muokkaa sukellustietokoneen lempinimeä kaksoisnäpäyttämällä muokattavaa kenttää"
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Muuta sukelluksen tietoja"
-#: divelist.c:2405
-#: divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
msgid "Edit dive date/time"
msgstr "Muuta sukelluksen ajankohtaa"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Muuta sukelluksen tietoja"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Muuta valittujen sukellusten tietoja"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Muuta retken tietoja"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Näytä / piilota tapahtumamerkit"
-#: equipment.c:949
-#: equipment.c:1456
+#: equipment.c:949 equipment.c:1456
msgid "End"
msgstr "Loppu"
-#: planner.c:1139
+#: planner.c:1149
msgid "Ending Depth"
msgstr "Kohdesyvyys"
@@ -757,69 +752,68 @@ msgstr "Kohdesyvyys"
msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr "Syötä käyttäjätunnus ja paina \"Lataa\"-painiketta. Kun tiedot on ladattu, voit painaa 'Hyväksy', jos haluat ottaa muutokset käyttöön."
-#: gtk-gui.c:1603
-#: info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Varusteet"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr "Virhe veden suolapitoisuuden määrityksessä"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Virhe ajan jäsentämisessä"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Virhe sukelluksen keston jäsentämisessä"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Virhe kaasuseoksen jäsentämisessä"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Virhe kaasuseosten määrän jäsentämisessä"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Virhe maksimisyvyyden jäsentämisessä"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Virhe näytteiden tulkinnassa"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Virhe perumiskäsittelijän rekisteröinnissä."
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Virhe tiedon rekisteröinnissä"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Virhe tapahtumakäsittelijän rekisteröinnissä."
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, fuzzy, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Tapahtuma: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Tapahtuma: odotetaan käyttäjän toimia"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Laajenna kaikki retket"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "%i tiedoston avaaminen epäonnistui."
@@ -834,12 +828,12 @@ msgstr "Tiedoston '%s' lukeminen epäonnistui."
msgid "Failed to parse '%s'.\n"
msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Tiedoston '%s' avaaminen epäonnistui"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
@@ -848,7 +842,7 @@ msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
msgid "Feb"
msgstr "helmi"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "jalka"
@@ -868,48 +862,47 @@ msgstr "Lataa kaikki sukellukset"
msgid "Fri"
msgstr "pe"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr ""
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr "GFhigh"
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr ""
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr "GFlow"
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (WGS84- tai GPS-muodossa)"
-#: statistics.c:854
+#: statistics.c:857
msgctxt "Amount"
msgid "Gas Used"
msgstr "Ilmankulutus"
-#: planner.c:1141
+#: planner.c:1151
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Kaasu"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr "Kaasun kulutus:\n"
-#: equipment.c:959
-#: print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Kaasuseos"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr "Yleisasetukset"
@@ -929,7 +922,7 @@ msgstr "Liitä tiedot XML-tiedostosta..."
msgid "Info"
msgstr "Tiedot"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr "Muodosta yhteys"
@@ -962,15 +955,11 @@ msgstr "Linus Torvalds, Dirk Hohndel et al., 2011, 2012, 2013"
msgid "List"
msgstr "Sukelluslista"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "litra"
-#: divelist.c:1428
-#: info.c:606
-#: info.c:676
-#: info.c:1147
-#: print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Kohde"
@@ -978,12 +967,12 @@ msgstr "Kohde"
msgid "Log"
msgstr "Loki"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Pisin"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Pisin sukellus"
@@ -1007,7 +996,7 @@ msgstr "Valitse sijainti"
msgid "Marker"
msgstr "merkki"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Sukellusvanhin"
@@ -1015,20 +1004,19 @@ msgstr "Sukellusvanhin"
msgid "Max Deco Time Warning"
msgstr "Varoitus: etappipysähdysaika"
-#: statistics.c:797
-#: statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Suurin syvyys"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Suurin pintakulutus"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Ylin lämpötila"
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -1039,7 +1027,7 @@ msgstr ""
"Kesto: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, fuzzy, c-format
msgid "Max. CNS"
msgstr "Max. CNS"
@@ -1048,17 +1036,17 @@ msgstr "Max. CNS"
msgid "MaxPress"
msgstr "Nimellispaine"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Suurin"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Suurin"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Korkein"
@@ -1067,50 +1055,50 @@ msgstr "Korkein"
msgid "May"
msgstr "touko"
-#: divelist.c:2339
+#: divelist.c:2368
msgid "Merge dives"
msgstr "Yhdistä sukellukset"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Liitä retki yllä olevaan retkeen"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Liitä retki alla olevaan retkeen"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "metri"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Pienin syvyys"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Pienin pintakulutus"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Alin lämpötila"
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Pienin"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Pienin"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Alin"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Sekalaiset asetukset"
@@ -1126,7 +1114,7 @@ msgstr "ma"
msgid "Multi-platform divelog software in C"
msgstr "Usean laitealustan sukelluspäiväkirjaohjelma C-kielellä"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr "N"
@@ -1134,7 +1122,7 @@ msgstr "N"
msgid "New"
msgstr "Uusi"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Uusi aloitusnumero"
@@ -1143,8 +1131,7 @@ msgstr "Uusi aloitusnumero"
msgid "Next DC"
msgstr "Seuraava DC"
-#: gtk-gui.c:1274
-#: gtk-gui.c:1999
+#: gtk-gui.c:1274 gtk-gui.c:1999
msgid "Nickname"
msgstr "Lempinimi"
@@ -1152,9 +1139,7 @@ msgstr "Lempinimi"
msgid "No Tank Data"
msgstr "Ei tietoja säiliöistä"
-#: info.c:611
-#: info.c:725
-#: info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Muistiinpanot"
@@ -1166,10 +1151,7 @@ msgstr "marras"
msgid "OLF"
msgstr "Happikertymä"
-#: divelist.c:1426
-#: gtk-gui.c:722
-#: print.c:363
-#: statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "Happikertymä"
@@ -1178,7 +1160,7 @@ msgstr "Happikertymä"
msgid "Oct"
msgstr "loka"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Outo pthread-virheen paluukoodi"
@@ -1186,7 +1168,7 @@ msgstr "Outo pthread-virheen paluukoodi"
msgid "Ok to delete the selected entry?"
msgstr "Poistetaanko valittu merkintä?"
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Avaa tiedosto"
@@ -1194,7 +1176,7 @@ msgstr "Avaa tiedosto"
msgid "Open..."
msgstr "Avaa..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr "Happi"
@@ -1215,11 +1197,11 @@ msgstr "Varoitus: hapen osapaine"
msgid "PO2 Green Warning"
msgstr "Varoitus: hapen osapaine (green)"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "psi"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr "Valitse kartalta"
@@ -1227,7 +1209,7 @@ msgstr "Valitse kartalta"
msgid "Planner"
msgstr "Suunnittelu"
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Asetukset"
@@ -1235,12 +1217,11 @@ msgstr "Asetukset"
msgid "Preferences..."
msgstr "Asetukset..."
-#: equipment.c:938
-#: equipment.c:944
+#: equipment.c:938 equipment.c:944
msgid "Pressure"
msgstr "Paine"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Paine:"
@@ -1249,15 +1230,15 @@ msgstr "Paine:"
msgid "Prev DC"
msgstr "Edellinen DC"
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Tulosta valitut sukellukset"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Tulosteen valinta"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Tulosteen tyyppi"
@@ -1269,7 +1250,7 @@ msgstr "Tulosta..."
msgid "Profile"
msgstr "Profiilikuvaaja"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
msgid "Profile Settings"
msgstr "Profiiliasetukset"
@@ -1285,8 +1266,7 @@ msgstr "Huomautus: kaasumäärä"
msgid "RGT Warning"
msgstr "Varoitus: kaasumäärä"
-#: info.c:705
-#: info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Yleisarvio"
@@ -1295,20 +1275,19 @@ msgstr "Yleisarvio"
msgid "Reading %s %s"
msgstr "Luetaan sukellusta %s"
-#: divelist.c:2051
-#: divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Poista retki"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Erota sukellus pois retkestä"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Erota valitut sukellukset pois retkestä"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Uudellennumeroi"
@@ -1320,24 +1299,20 @@ msgstr "Uudellennumeroi..."
msgid "Retry"
msgstr "Yritä uudestaan"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr ""
-#: divelist.c:1425
-#: gtk-gui.c:674
-#: print.c:410
-#: statistics.c:182
-#: statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "Pintakulutus"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr "Pintakulutus deko-pysähdyksessä"
-#: planner.c:1235
+#: planner.c:1257
msgid "SAC during dive"
msgstr "Pintakulutus sukelluksen aikana"
@@ -1357,23 +1332,28 @@ msgstr "la"
msgid "Save As..."
msgstr "Tallenna nimellä..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Tallenna muutokset?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Tallenna nimellä"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Tallenna nimellä..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Tallenna..."
-#: planner.c:1140
+#: planner.c:1150
msgid "Segment Time"
msgstr "Aika"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
#, fuzzy
msgid "Select Events"
msgstr "Valitse tapahtumat"
@@ -1395,63 +1375,61 @@ msgstr ""
"Tiedoston req.txt kirjoittaminen epäonnistui.\n"
"Onko Uemis Zurich kytketty oikein?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Lyhin"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Lyhin sukellus"
-#: gtk-gui.c:653
-#: gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Näytä sarakkeet"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
#, fuzzy
msgid "Show EAD, END, EADD"
msgstr "Näytä EAD, END sekä EADD"
-#: gtk-gui.c:795
+#: gtk-gui.c:799
#, fuzzy
msgid "Show MOD"
msgstr "Näytä MOD"
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr "Näytä laskettu kattosyvyys"
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr "Näytä sukellustietokoneen raportoima kattosyvyys punaisella"
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr "Näytä kartalla"
-#: gtk-gui.c:778
+#: gtk-gui.c:782
#, fuzzy
msgid "Show pHe graph"
msgstr "Näytä pHe-kuvaaja"
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, fuzzy, c-format
msgid "Show pN%s graph"
msgstr "Näytä pN%s-kuvaaja"
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr "Näytä pO%s-kuvaaja"
-#: planner.c:191
+#: planner.c:192
msgid "Simulated Dive"
msgstr "Simuloitu sukellus"
-#: equipment.c:935
-#: equipment.c:1453
+#: equipment.c:935 equipment.c:1453
msgid "Size"
msgstr "Tilavuus"
@@ -1463,20 +1441,19 @@ msgstr "Huomautus: nousunopeus"
msgid "Speed Warning"
msgstr "Varoitus: nousunopeus"
-#: equipment.c:946
-#: equipment.c:1455
+#: equipment.c:946 equipment.c:1455
msgid "Start"
msgstr "Alku"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr "Aloita lataus"
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Tilastot"
-#: statistics.c:705
+#: statistics.c:708
#, c-format
msgid "Statistics %s"
msgstr "Tilastot %s"
@@ -1490,26 +1467,12 @@ msgstr "Tilastot"
msgid "Status"
msgstr "Tila"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s\n"
-#: planner.c:461
-#, fuzzy, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-"Subsurfacen laskema sukellussuunnitelma\n"
-"perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f\n"
-"\n"
-
-#: divelist.c:1422
-#: gtk-gui.c:684
-#: info.c:706
-#: info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Puku"
@@ -1518,21 +1481,21 @@ msgstr "Puku"
msgid "Sun"
msgstr "su"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Pinta-aika"
-#: planner.c:1220
+#: planner.c:1242
#, fuzzy
msgid "Surface Pressure (mbar)"
msgstr "Ilmanpaine pinnalla (mbar)"
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr "Vaihda kaasu seuraavaan: %s\n"
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Taulukkotuloste"
@@ -1544,19 +1507,19 @@ msgstr "Säiliönvaihtoehdotus"
msgid "Tank Pressure Info"
msgstr "Tiedotus: säiliöpaine"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr "Tekniikka-asetukset"
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Lämpötila"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Lämpötila"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Lämpötila:"
@@ -1568,8 +1531,7 @@ msgstr "Kaikki"
msgid "Thu"
msgstr "to"
-#: info.c:1016
-#: print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Kello"
@@ -1585,21 +1547,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Venytä sukellusprofiilikuvaajaa"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Yhteensä"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Kokonaisaika"
-#: print.c:336
+#: print.c:321
#, c-format
msgid "Total Weight:"
msgstr "Kokonaismassa:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %s\n"
@@ -1616,8 +1578,7 @@ msgstr[1] "Retki %1$s, %3$d. %2$skuuta %4$04d (%5$d sukellusta)"
msgid "Tue"
msgstr "ti"
-#: equipment.c:1452
-#: equipment.c:1480
+#: equipment.c:1452 equipment.c:1480
msgid "Type"
msgstr "Tyyppi"
@@ -1642,25 +1603,25 @@ msgstr ""
"Liitä sukellustietokone uudestaan\n"
"ja yritä uudestaan."
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Uemiksen lukeminen epäonnistui"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "libdivecomputer-kontekstin luominen epäonnistui"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Jäsentäjän luominen %s %s epäonnistui"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, fuzzy, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Avaaminen epäonnistui %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Yksiköt"
@@ -1672,20 +1633,19 @@ msgstr "Käyttäjätunniste"
msgid "View"
msgstr "Näytä"
-#: info.c:711
-#: statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr "Näkyvyys"
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Tilavuus:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr ""
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Veden lämpötila"
@@ -1698,32 +1658,28 @@ msgstr "Webservice"
msgid "Wed"
msgstr "ke"
-#: equipment.c:985
-#: equipment.c:1579
-#: gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Painot"
-#: equipment.c:1084
-#: print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Painot"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Massa:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML-tiedosto"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Vuosi"
-#: gtk-gui.c:1371
-#: statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Vuositilastot"
@@ -1740,7 +1696,7 @@ msgstr ""
"Voit halutessasi antaa laitteelle lempinimen. Lempinimen antaminen helpottaa sukellustietokoneen sekä sen lokien tunnistamisessa. Oletuksena laitteen nimenä käytetään sen mallia ja tunnistetta.\n"
"Jos et halua antaa laitteelle lempinimeä, paina \"Peru\"-painiketta."
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1748,8 +1704,7 @@ msgstr ""
"Sinulla on tallentamattomia muutoksia.\n"
"Haluatko tallentaa muutokset ennen tietojen sulkemista?"
-#: gtk-gui.c:211
-#: gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1758,10 +1713,7 @@ msgstr ""
"Tiedosto %s on muuttunut.\n"
"Haluatko tallentaa muutokset ennen tietojen sulkemista?"
-#: divelist.c:544
-#: planner.c:74
-#: planner.c:725
-#: print.c:183
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
#: profile.c:399
#, c-format
msgid "air"
@@ -1807,8 +1759,7 @@ msgstr "katto (turvapysähdys)"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91
-#: planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "ft³"
@@ -1840,39 +1791,36 @@ msgstr "sukellusaika"
msgid "drysuit"
msgstr "kuivapuku"
-#: planner.c:727
+#: planner.c:734
msgid "ean"
msgstr ""
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr "kaikille sukelluksille"
-#: statistics.c:674
+#: statistics.c:677
#, fuzzy, c-format
msgid "for dive #%d"
msgstr "Sukellus #%d - "
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr "sukellukselle numero "
-#: statistics.c:676
+#: statistics.c:679
#, c-format
msgid "for selected dive"
msgstr "valittu sukellus"
-#: statistics.c:640
+#: statistics.c:643
#, c-format
msgid "for selected dives"
msgstr "valitut sukellukset"
-#: dive.c:117
-#: divelist.c:1418
-#: info.c:1078
-#: planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1880,8 +1828,7 @@ msgstr "ft"
msgid "full suit"
msgstr "kokopuku"
-#: libdivecomputer.c:151
-#: libdivecomputer.c:154
+#: libdivecomputer.c:151 libdivecomputer.c:154
msgid "gaschange"
msgstr "Kaasun vaihto"
@@ -1901,9 +1848,7 @@ msgstr "tuntematon tapahtumanumero"
msgid "jacket"
msgstr "takki"
-#: dive.c:141
-#: equipment.c:1004
-#: gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1911,10 +1856,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137
-#: divelist.c:1421
-#: equipment.c:1006
-#: gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "pauna"
@@ -1922,18 +1864,16 @@ msgstr "pauna"
msgid "long john"
msgstr ""
-#: dive.c:112
-#: info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
#, fuzzy
msgid "max ppO2"
msgstr "max ppO2"
-#: divelist.c:1427
-#: gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
#, fuzzy
msgid "maxCNS"
msgstr "maxCNS"
@@ -1946,12 +1886,11 @@ msgstr "Suurin syvyys"
msgid "membrane"
msgstr ""
-#: divelist.c:1419
-#: planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)"
@@ -1960,7 +1899,7 @@ msgstr "malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)"
msgid "more data dive id"
msgstr ""
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "yli %d päivää"
@@ -1973,17 +1912,17 @@ msgstr "keskeytyksetön aika"
msgid "none"
msgstr "ei mitään"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
#, fuzzy
msgid "pHe threshold"
msgstr "pHe-kynnys"
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, fuzzy, c-format
msgid "pN%s threshold"
msgstr "pN%s-kynnys"
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, fuzzy, c-format
msgid "pO%s threshold"
msgstr "pO%s-kynnys"
@@ -2043,16 +1982,11 @@ msgstr ""
msgid "transmitter"
msgstr "lähetin"
-#: equipment.c:1345
-#: equipment.c:1365
+#: equipment.c:1345 equipment.c:1365
msgid "unkn"
msgstr "tuntematon"
-#: libdivecomputer.c:152
-#: print.c:317
-#: statistics.c:563
-#: statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "tuntematon"
@@ -2083,6 +2017,9 @@ msgstr "työmäärä"
#~ msgid "%1$s, %3$s.%2$d.%4$04d %5$dh%6$02d"
#~ msgstr "%1$s, %2$d. %3$skuuta %4$04d %5$dh%6$02d"
+#~ msgid "1 dive per page"
+#~ msgstr "Yksi sukellus sivulle"
+
#~ msgid "About"
#~ msgstr "Tietoja"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 6bda05db8..16fa4c532 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: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2012-10-27 02:44+0200\n"
"Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
"Language-Team: French\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > mois"
@@ -32,48 +32,48 @@ msgstr ""
msgid " Please select dive computer and device. "
msgstr " Veuillez choisir un ordinateur de plongée et un périphérique. "
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr ""
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "N°"
-#: print.c:322
+#: print.c:307
#, fuzzy, c-format
msgid "%.*f %s"
msgstr "%.*f %s/min"
-#: print.c:267 print.c:340
+#: print.c:252 print.c:325
#, fuzzy, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s/min"
-#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr ""
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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:584
+#: print.c:575
#, 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"
@@ -85,60 +85,60 @@ 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:551
+#: statistics.c:549
#, 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:609 statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%d j %d h %d min"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%d h %d min"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr ""
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
"CNS:%u%%"
msgstr ""
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
"Calculated ceiling %.0f %s"
msgstr ""
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
"Deco:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
"Deco:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -147,82 +147,91 @@ msgid ""
"EADD:%d%s"
msgstr ""
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
"In deco"
msgstr ""
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
"MOD:%d%s"
msgstr ""
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
"NDL:%umin"
msgstr ""
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
"P:%d %s"
msgstr ""
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
"Safetystop:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
"Safetystop:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2107
+#: planner.c:468
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
"T:%.1f %s"
msgstr ""
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
"pHe:%.2fbar"
msgstr ""
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
"pN%s:%.2fbar"
msgstr ""
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
"pO%s:%.2fbar"
msgstr ""
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) ou (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, fuzzy, c-format
msgid "(no dives)"
msgstr "Modifier les plongées"
@@ -231,53 +240,49 @@ msgstr "Modifier les plongées"
msgid "(nothing)"
msgstr ""
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr ""
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr ""
-#: print.c:907
-msgid "1 dive per page"
+#: planner.c:1253
+msgid "17 l/min"
msgstr ""
-#: planner.c:1231
-msgid "17 l/min"
+#: print.c:924
+msgid "2 dives per page"
msgstr ""
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr ""
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr ""
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr ""
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr ""
-#: planner.c:1203
+#: planner.c:1197
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given "
-"depth, takes the given time (if relative, e.g. '+3:30') or ends at the given "
-"time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
-"An entry that has a depth and a gas given but no time is special; it informs "
-"the planner that the gas specified is available for the ascent once the "
-"depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr ""
@@ -289,28 +294,28 @@ msgstr "À propos de Subsurface"
msgid "Add Dive..."
msgstr "Ajouter une plongée..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Ajouter une plongée"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Ajouter au groupe au-dessus"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr ""
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr ""
-#: statistics.c:844
+#: statistics.c:847
#, fuzzy
msgid "Air Temp"
msgstr "Temp. moy."
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr ""
@@ -331,64 +336,64 @@ msgstr "Août"
msgid "Autogroup"
msgstr "Grouper automatiquement"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Moyenne"
-#: statistics.c:799 statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Profondeur moy."
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Consommation d'air moy."
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Temp. moy."
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Temps moy."
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr ""
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "bar"
-#: info.c:700 info.c:1153 print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Binôme"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr ""
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr ""
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr ""
@@ -396,11 +401,11 @@ msgstr ""
msgid "Cannot parse response!"
msgstr ""
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Choisissez le fichier XML par défaut"
@@ -412,7 +417,7 @@ msgstr "Choisissez le fichier XML à importer dans les données actuelles"
msgid "Close"
msgstr "Fermer"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Tout replier"
@@ -424,19 +429,19 @@ msgstr ""
msgid "Connection Error: "
msgstr ""
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Créer un nouveau groupe au-dessus"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "Pieds³"
-#: divelist.c:1423 gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Blk"
-#: equipment.c:918 equipment.c:1029 print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Block"
@@ -444,20 +449,24 @@ msgstr "Block"
msgid "Cylinders"
msgstr "Blocks"
-#: profile.c:2098
+#: profile.c:2102
#, fuzzy, c-format
msgid "D:%.1f %s"
msgstr "%.*f %s/min"
-#: divelist.c:1416 print.c:510 statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Date"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Date et heure"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Date :"
@@ -465,7 +474,7 @@ msgstr "Date :"
msgid "Dec"
msgstr "Déc."
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Fichier XML par défaut"
@@ -473,19 +482,19 @@ msgstr "Fichier XML par défaut"
msgid "Delete a dive computer information entry"
msgstr ""
-#: divelist.c:2206 divelist.c:2259 divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Supprimer la plongée"
-#: divelist.c:2208 divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Supprimer les plongées"
-#: print.c:510 statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Profondeur"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Profondeur (%s) :"
@@ -494,7 +503,7 @@ msgstr "Profondeur (%s) :"
msgid "Depth Limit Exceeded"
msgstr "Profondeur plafond dépassée"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Profondeur :"
@@ -513,12 +522,12 @@ msgstr ""
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Plongée n°%1$d - %2$s %4$02d/%3$02d/%5$04d à %6$d:%7$02d"
-#: info.c:157 print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Plongée n°%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Plongée n°%d - %s %d %04d"
@@ -528,7 +537,7 @@ msgstr "Plongée n°%d - %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Ordinateur de plongée"
-#: gtk-gui.c:1607 info.c:898 statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Détails de plongée"
@@ -536,11 +545,11 @@ msgstr "Détails de plongée"
msgid "Dive Notes"
msgstr "Notes de Plongée"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr ""
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Temps de plongée"
@@ -556,11 +565,11 @@ msgstr "Information du temps de plongée"
msgid "Dive computer vendor and product"
msgstr ""
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Erreur à l'import des données de plongées"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Détails de plongée"
@@ -569,27 +578,27 @@ msgstr "Détails de plongée"
msgid "Dive locations"
msgstr "Notes de Plongée"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Chef de Palanquée"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr ""
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Plongée n°"
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Police pour la liste de plongée"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Chef de palanquée"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Plongées"
@@ -620,28 +629,28 @@ msgstr "Télécharger depuis l'ordinateur de plongée..."
msgid "Download Success!"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Durée"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Durée (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr ""
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr ""
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr ""
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr ""
@@ -658,42 +667,40 @@ msgstr "Nom du périphérique"
msgid "Edit Dive Computer Nicknames"
msgstr ""
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Modifier les informations du groupe"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Modifier le résumé du groupe"
#: gtk-gui.c:1302
-msgid ""
-"Edit a dive computer nickname by double-clicking the in the relevant "
-"nickname field"
+msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr ""
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Modifier la plongée"
-#: divelist.c:2405 divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
#, fuzzy
msgid "Edit dive date/time"
msgstr "Modifier la plongée"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Modifier les plongées"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Modifier plusieurs plongées"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Modifier le résumé du groupe"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Activer / Désactiver évênements"
@@ -701,80 +708,78 @@ msgstr "Activer / Désactiver évênements"
msgid "End"
msgstr "Fin"
-#: planner.c:1139
+#: planner.c:1149
#, fuzzy
msgid "Ending Depth"
msgstr "Profondeur min."
#: webservice.c:220
-msgid ""
-"Enter a user identifier and press 'Download'. Once the download is complete "
-"you can press 'Apply' if you wish to apply the changes."
+msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr ""
-#: gtk-gui.c:1603 info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Équipement"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
#, fuzzy
msgid "Error obtaining water salinity"
msgstr "Impossible d'analyser des échantillons"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Impossible d'analyser l'heure"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Impossible d'analyser le temps de plongée"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Impossible d'analyser le mélange gazeux"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Impossible d'analyser le nombre de mélange gazeux"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Impossible d'analyser la profondeux maximale"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Impossible d'analyser des échantillons"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Impossible d'enregistrer le gestionnaire d'annulation."
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Impossible d'enregistrer de la date"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Impossible d'enregistrer le gestionnaire d'événement."
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Événement : systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Événement : attente d'une action de l'utilisateur"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Tout déplier"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Impossible de l'ouverture du fichier %i."
@@ -789,12 +794,12 @@ msgstr "Impossible d'analyser « %s »"
msgid "Failed to parse '%s'.\n"
msgstr "Impossible d'analyser « %s ».\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Impossible de la lecture « %s »"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Impossible de lire « %s ».\n"
@@ -803,7 +808,7 @@ msgstr "Impossible de lire « %s ».\n"
msgid "Feb"
msgstr "Fév."
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "Pieds"
@@ -823,48 +828,48 @@ msgstr ""
msgid "Fri"
msgstr "Ven."
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr ""
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr ""
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr ""
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr ""
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr ""
-#: statistics.c:854
+#: statistics.c:857
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Air utilisé"
-#: planner.c:1141
+#: planner.c:1151
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Air utilisé"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr ""
-#: equipment.c:959 print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Mélange gazeux"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr ""
@@ -884,7 +889,7 @@ msgstr "Importer les fichiers XML..."
msgid "Info"
msgstr "Information"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr ""
@@ -918,11 +923,11 @@ msgstr "Linus Torvalds, Dirk Hohndel et autres, 2011, 2012"
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "Litre"
-#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Lieu"
@@ -930,12 +935,12 @@ msgstr "Lieu"
msgid "Log"
msgstr "Journal"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Plus longue"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Plongée la plus longue"
@@ -959,7 +964,7 @@ msgstr ""
msgid "Marker"
msgstr "Marker"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Chef"
@@ -967,19 +972,19 @@ msgstr "Chef"
msgid "Max Deco Time Warning"
msgstr "Avertissement de temps de décompression max"
-#: statistics.c:797 statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Profondeur max."
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Consommation d'air max."
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Temp. max."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -990,7 +995,7 @@ msgstr ""
"Durée : %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr ""
@@ -999,17 +1004,17 @@ msgstr ""
msgid "MaxPress"
msgstr "PressionMax"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Maximum"
@@ -1018,51 +1023,51 @@ msgstr "Maximum"
msgid "May"
msgstr "Mai"
-#: divelist.c:2339
+#: divelist.c:2368
#, fuzzy
msgid "Merge dives"
msgstr "Supprimer les plongées"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Fusionner le groupe avec le groupe au dessus"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Fusionner le groupe avec le groupe au dessous"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "Mètre"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Profondeur min."
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Consommation d'air min."
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Temp. min."
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Options diverses"
@@ -1078,7 +1083,7 @@ msgstr "Lun."
msgid "Multi-platform divelog software in C"
msgstr "Journal de plongée multi-système écrit en C"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr ""
@@ -1086,7 +1091,7 @@ msgstr ""
msgid "New"
msgstr "Nouveau"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Nouveau numéro de départ"
@@ -1103,7 +1108,7 @@ msgstr "Nom du périphérique"
msgid "No Tank Data"
msgstr "Pas d'information sur le block"
-#: info.c:611 info.c:725 info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Notes"
@@ -1115,7 +1120,7 @@ msgstr "Nov."
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1124,7 +1129,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "Oct."
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Étrange erreur pthread retournée"
@@ -1132,7 +1137,7 @@ msgstr "Étrange erreur pthread retournée"
msgid "Ok to delete the selected entry?"
msgstr ""
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Ouvrir Fichier"
@@ -1140,7 +1145,7 @@ msgstr "Ouvrir Fichier"
msgid "Open..."
msgstr "Ouvrir..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr ""
@@ -1161,11 +1166,11 @@ msgstr "Avertissement PO2 ascendant"
msgid "PO2 Green Warning"
msgstr "Avertissement PO2 Vert"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "PSI"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr ""
@@ -1173,7 +1178,7 @@ msgstr ""
msgid "Planner"
msgstr ""
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Préférences"
@@ -1185,7 +1190,7 @@ msgstr "Préférences..."
msgid "Pressure"
msgstr "Pression"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Pression :"
@@ -1193,15 +1198,15 @@ msgstr "Pression :"
msgid "Prev DC"
msgstr ""
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Imprimer uniquement les plongées selectionnées"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Imprimer la sélection"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Type d'impression"
@@ -1213,7 +1218,7 @@ msgstr "Imprimer..."
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
#, fuzzy
msgid "Profile Settings"
msgstr "Profil"
@@ -1230,7 +1235,7 @@ msgstr "Alerte temps air restant"
msgid "RGT Warning"
msgstr "Avertissement temps d'air restant"
-#: info.c:705 info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Évaluation"
@@ -1239,19 +1244,19 @@ msgstr "Évaluation"
msgid "Reading %s %s"
msgstr "Lecture de la plongée %s"
-#: divelist.c:2051 divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Supprimer groupe"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Retirer la plongée du groupe"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Retirer les plongées sélectionnées du groupe"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Renuméroter"
@@ -1263,20 +1268,20 @@ msgstr "Renuméroter..."
msgid "Retry"
msgstr "Essayer à nouveau"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr ""
-#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "Consommation d'air"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr ""
-#: planner.c:1235
+#: planner.c:1257
#, fuzzy
msgid "SAC during dive"
msgstr "Ajouter une plongée"
@@ -1298,24 +1303,29 @@ msgid "Save As..."
msgstr "Enregistrer sous..."
# Title
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Enregistrement des changements ?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Enregistrer le fichier sous"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Enregistrer sous..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Enregistrer..."
-#: planner.c:1140
+#: planner.c:1150
#, fuzzy
msgid "Segment Time"
msgstr "Temps moy."
-#: gtk-gui.c:944
+#: gtk-gui.c:948
msgid "Select Events"
msgstr "Sélection des évènements"
@@ -1335,54 +1345,54 @@ msgstr ""
"Écriture partielle des progrès dans le fichier req.txt\n"
"Est-ce que votre Uemis Zurich est branché correctement ?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Plus courte"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Plongée la plus courte"
-#: gtk-gui.c:653 gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Afficher les colonnes"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr ""
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr ""
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr ""
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr ""
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr ""
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr ""
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr ""
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr ""
-#: planner.c:191
+#: planner.c:192
msgid "Simulated Dive"
msgstr ""
@@ -1402,15 +1412,15 @@ msgstr "Avertissemnt de vitesse"
msgid "Start"
msgstr "Début"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr ""
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Statistiques"
-#: statistics.c:705
+#: statistics.c:708
#, fuzzy, c-format
msgid "Statistics %s"
msgstr "Statistiques"
@@ -1424,20 +1434,12 @@ msgstr "Stats"
msgid "Status"
msgstr "Stats"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-
-#: divelist.c:1422 gtk-gui.c:684 info.c:706 info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Combinaison"
@@ -1446,20 +1448,20 @@ msgstr "Combinaison"
msgid "Sun"
msgstr "Dim."
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Intervale de surface"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr ""
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr ""
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Impression en tableau"
@@ -1471,19 +1473,19 @@ msgstr "Changement de block suggéré"
msgid "Tank Pressure Info"
msgstr "Information de pression block"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr ""
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temp."
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Température"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Température :"
@@ -1495,7 +1497,7 @@ msgstr "Trois"
msgid "Thu"
msgstr "Jeu."
-#: info.c:1016 print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Temps"
@@ -1509,21 +1511,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Changer de zoom"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Temps Total"
-#: print.c:336
+#: print.c:321
#, fuzzy, c-format
msgid "Total Weight:"
msgstr "Poids:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
@@ -1565,25 +1567,25 @@ msgstr ""
"Débranchez et re-branchez l'ordinateur\n"
"et re-essayez"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Impossible d'initialiser Uemis"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Impossible de créer un context libdivecomputer"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Impossible de créer une analyse pour %s %s"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Impossible d'ouvrir %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Unités"
@@ -1595,19 +1597,19 @@ msgstr ""
msgid "View"
msgstr "Vue"
-#: info.c:711 statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr ""
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Volume :"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr ""
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Temp. de l'eau"
@@ -1619,28 +1621,28 @@ msgstr ""
msgid "Wed"
msgstr "Mer."
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Poids"
-#: equipment.c:1084 print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Système de poids"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Poids:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "Fichier XML"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Année"
-#: gtk-gui.c:1371 statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Statistiques annuelles"
@@ -1649,14 +1651,11 @@ msgstr "Statistiques annuelles"
msgid ""
"You already have a dive computer of this model\n"
"named %s\n"
-"Subsurface can maintain a nickname for this device to distinguish it from "
-"the existing one. The default is the model and device ID as shown below.\n"
-"If you don't want to name this dive computer click 'Cancel' and Subsurface "
-"will simply display its model as its name (which may mean that you cannot "
-"tell the two dive computers apart in the logs)."
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
msgstr ""
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1664,7 +1663,7 @@ msgstr ""
"Vous avez des changements non-enregistrés.\n"
"Souhaitez-vous enregistrer ces changements avant de fermer ?"
-#: gtk-gui.c:211 gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1673,7 +1672,8 @@ msgstr ""
"Vous avez des changements non-enregistrés dans le fichier : %s \n"
"Souhaitez-vous enregistrer ces changements avant de le fermer ?"
-#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
+#: profile.c:399
#, c-format
msgid "air"
msgstr "air"
@@ -1718,7 +1718,7 @@ msgstr "plafond (palier de sécurité)"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91 planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "pied³"
@@ -1751,37 +1751,37 @@ msgstr "Temps de plongée"
msgid "drysuit"
msgstr ""
-#: planner.c:727
+#: planner.c:734
#, fuzzy
msgid "ean"
msgstr "Janv."
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr ""
-#: statistics.c:674
+#: statistics.c:677
#, fuzzy, c-format
msgid "for dive #%d"
msgstr "Plongée n°%d - "
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr ""
-#: statistics.c:676
+#: statistics.c:679
#, fuzzy, c-format
msgid "for selected dive"
msgstr "Imprimer uniquement les plongées selectionnées"
-#: statistics.c:640
+#: statistics.c:643
#, fuzzy, c-format
msgid "for selected dives"
msgstr "Imprimer uniquement les plongées selectionnées"
-#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "pied"
@@ -1809,7 +1809,7 @@ msgstr "numéro d'événement non valide"
msgid "jacket"
msgstr ""
-#: dive.c:141 equipment.c:1004 gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1817,7 +1817,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "livre US"
@@ -1825,15 +1825,15 @@ msgstr "livre US"
msgid "long john"
msgstr ""
-#: dive.c:112 info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr ""
-#: divelist.c:1427 gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr ""
@@ -1845,11 +1845,11 @@ msgstr "prof. max"
msgid "membrane"
msgstr ""
-#: divelist.c:1419 planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "modèle=%u (0x%08x), firmware=%u (0x%08x), port série=%u (0x%08x)"
@@ -1859,7 +1859,7 @@ msgstr "modèle=%u (0x%08x), firmware=%u (0x%08x), port série=%u (0x%08x)"
msgid "more data dive id"
msgstr "plus de %d jours"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "plus de %d jours"
@@ -1872,16 +1872,16 @@ msgstr ""
msgid "none"
msgstr "aucun"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr ""
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr ""
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr ""
@@ -1946,8 +1946,7 @@ msgstr "transmetteur"
msgid "unkn"
msgstr "inconnu"
-#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "inconnu"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 61064c377..5c2331ea4 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: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2012-10-18 15:00+0100\n"
"Last-Translator: Ivan Habunek <ivan.habunek@gmail.com>\n"
"Language-Team: Croatian\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Mjesec"
@@ -32,48 +32,48 @@ msgstr ""
msgid " Please select dive computer and device. "
msgstr "Odaberite ronilačko računalo i naziv uređaja."
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr ""
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "#"
-#: print.c:322
+#: print.c:307
#, fuzzy, c-format
msgid "%.*f %s"
msgstr "%.*f %s/min"
-#: print.c:267 print.c:340
+#: print.c:252 print.c:325
#, fuzzy, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s/min"
-#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr ""
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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:584
+#: print.c:575
#, 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"
@@ -85,60 +85,60 @@ 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:551
+#: statistics.c:549
#, 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:609 statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %dh %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr ""
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
"CNS:%u%%"
msgstr ""
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
"Calculated ceiling %.0f %s"
msgstr ""
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
"Deco:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
"Deco:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -147,82 +147,91 @@ msgid ""
"EADD:%d%s"
msgstr ""
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
"In deco"
msgstr ""
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
"MOD:%d%s"
msgstr ""
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
"NDL:%umin"
msgstr ""
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
"P:%d %s"
msgstr ""
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
"Safetystop:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
"Safetystop:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2107
+#: planner.c:468
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
"T:%.1f %s"
msgstr ""
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
"pHe:%.2fbar"
msgstr ""
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
"pN%s:%.2fbar"
msgstr ""
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
"pO%s:%.2fbar"
msgstr ""
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) ili (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, fuzzy, c-format
msgid "(no dives)"
msgstr "Uredi urone"
@@ -231,53 +240,49 @@ msgstr "Uredi urone"
msgid "(nothing)"
msgstr ""
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr ""
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr ""
-#: print.c:907
-msgid "1 dive per page"
+#: planner.c:1253
+msgid "17 l/min"
msgstr ""
-#: planner.c:1231
-msgid "17 l/min"
+#: print.c:924
+msgid "2 dives per page"
msgstr ""
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr ""
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr ""
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr ""
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr ""
-#: planner.c:1203
+#: planner.c:1197
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given "
-"depth, takes the given time (if relative, e.g. '+3:30') or ends at the given "
-"time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
-"An entry that has a depth and a gas given but no time is special; it informs "
-"the planner that the gas specified is available for the ascent once the "
-"depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr ""
@@ -289,28 +294,28 @@ msgstr ""
msgid "Add Dive..."
msgstr "Dodaj uron..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Dodaj uron"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Dodaj u gornju grupu"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr ""
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr ""
-#: statistics.c:844
+#: statistics.c:847
#, fuzzy
msgid "Air Temp"
msgstr "Prosj. temp."
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr ""
@@ -331,64 +336,64 @@ msgstr "Kol"
msgid "Autogroup"
msgstr "Automatsko grupiranje"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Ø"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Ø"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Ø"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Ø"
-#: statistics.c:799 statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Prosj. dubina"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Prosj. SAC"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Prosj. temp."
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Prosj. trajanje"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr ""
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "Bar"
-#: info.c:700 info.c:1153 print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Buddy"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr ""
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr ""
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr ""
@@ -396,11 +401,11 @@ msgstr ""
msgid "Cannot parse response!"
msgstr ""
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celzijus"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Odaberite defaultnu XML datoteku"
@@ -412,7 +417,7 @@ msgstr "Odaberite XML datoteke za uvoz u trenutačnu datoteku"
msgid "Close"
msgstr "Zatvori"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Zatvori sve grupe"
@@ -424,19 +429,19 @@ msgstr ""
msgid "Connection Error: "
msgstr ""
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Kreiraj novu grupu iznad"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "CuSt"
-#: divelist.c:1423 gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Boca"
-#: equipment.c:918 equipment.c:1029 print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Boca"
@@ -444,20 +449,24 @@ msgstr "Boca"
msgid "Cylinders"
msgstr "Boce"
-#: profile.c:2098
+#: profile.c:2102
#, fuzzy, c-format
msgid "D:%.1f %s"
msgstr "%.*f %s/min"
-#: divelist.c:1416 print.c:510 statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Datum"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Datum i vrijeme"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Datum:"
@@ -465,7 +474,7 @@ msgstr "Datum:"
msgid "Dec"
msgstr "Pro"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Defaultna XML datoteka"
@@ -473,19 +482,19 @@ msgstr "Defaultna XML datoteka"
msgid "Delete a dive computer information entry"
msgstr ""
-#: divelist.c:2206 divelist.c:2259 divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Obriši uron"
-#: divelist.c:2208 divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Obriši urone"
-#: print.c:510 statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Dubina"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Dubina (%s):"
@@ -494,7 +503,7 @@ msgstr "Dubina (%s):"
msgid "Depth Limit Exceeded"
msgstr "Premašeno ograničenje dubine"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Dubina:"
@@ -513,12 +522,12 @@ msgstr ""
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Uron #%1$d - %2$s %4$02d.%3$02d.%5$04d u %6$d:%7$02d"
-#: info.c:157 print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Uron #%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Uron #%d - %s %d %04d"
@@ -528,7 +537,7 @@ msgstr "Uron #%d - %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Ronilačko računalo"
-#: gtk-gui.c:1607 info.c:898 statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Informacije o uronu"
@@ -536,11 +545,11 @@ msgstr "Informacije o uronu"
msgid "Dive Notes"
msgstr "Bilješke"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr ""
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Vrijeme urona"
@@ -556,11 +565,11 @@ msgstr "Info: Trajanje urona"
msgid "Dive computer vendor and product"
msgstr ""
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr ""
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Podaci o uronu"
@@ -569,27 +578,27 @@ msgstr "Podaci o uronu"
msgid "Dive locations"
msgstr "Bilješke"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Voditelj"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr ""
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Uron br."
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Font za listu urona"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Voditelj"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Uroni"
@@ -620,28 +629,28 @@ msgstr "Preuzmi s ronilačkog računala..."
msgid "Download Success!"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Trajanje"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Trajanje (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr ""
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr ""
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr ""
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr ""
@@ -658,42 +667,40 @@ msgstr "Naziv uređaja"
msgid "Edit Dive Computer Nicknames"
msgstr ""
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Uredi informacije o grupi"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Uredi sažetak grupe"
#: gtk-gui.c:1302
-msgid ""
-"Edit a dive computer nickname by double-clicking the in the relevant "
-"nickname field"
+msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr ""
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Uredi uron"
-#: divelist.c:2405 divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
#, fuzzy
msgid "Edit dive date/time"
msgstr "Uredi uron"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Uredi urone"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Uredi više urona"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Uredi sažetak urona"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Uključi/isključi događaje"
@@ -701,79 +708,77 @@ msgstr "Uključi/isključi događaje"
msgid "End"
msgstr "Kraj"
-#: planner.c:1139
+#: planner.c:1149
#, fuzzy
msgid "Ending Depth"
msgstr "Najmanja dubina"
#: webservice.c:220
-msgid ""
-"Enter a user identifier and press 'Download'. Once the download is complete "
-"you can press 'Apply' if you wish to apply the changes."
+msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr ""
-#: gtk-gui.c:1603 info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Oprema"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr ""
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr ""
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr ""
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr ""
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr ""
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr ""
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr ""
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr ""
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr ""
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr ""
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr ""
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr ""
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Otvori sve"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Nije uspjelo otvaranje %i datoteka"
@@ -788,12 +793,12 @@ msgstr "Nije uspjelo parsiranje '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Nije uspjelo parsiranje '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Nije uspjelo čitanje '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Nije uspjelo čitanje '%s'.\n"
@@ -802,7 +807,7 @@ msgstr "Nije uspjelo čitanje '%s'.\n"
msgid "Feb"
msgstr "Velj"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "Stope"
@@ -822,48 +827,48 @@ msgstr ""
msgid "Fri"
msgstr "Pet"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr ""
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr ""
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr ""
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr ""
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr ""
-#: statistics.c:854
+#: statistics.c:857
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Potrošeno plina"
-#: planner.c:1141
+#: planner.c:1151
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Potrošeno plina"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr ""
-#: equipment.c:959 print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Mješavina"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr ""
@@ -883,7 +888,7 @@ msgstr "Uvezi XML datoteke..."
msgid "Info"
msgstr "Informacije"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr ""
@@ -917,11 +922,11 @@ msgstr "Linus Torvalds, Dirk Hohndel i drugi, 2011, 2012"
msgid "List"
msgstr "Popis"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "Litra"
-#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Lokacija"
@@ -929,12 +934,12 @@ msgstr "Lokacija"
msgid "Log"
msgstr "Dnevnik"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Maks."
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Najduži uron"
@@ -958,7 +963,7 @@ msgstr ""
msgid "Marker"
msgstr "Oznaka"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Master"
@@ -966,19 +971,19 @@ msgstr "Master"
msgid "Max Deco Time Warning"
msgstr "Upozorenje: Max. vrijeme dekompresije"
-#: statistics.c:797 statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Maks. dubina"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Najveći SAC"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Maks. temp."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -989,7 +994,7 @@ msgstr ""
"Trajanje: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr ""
@@ -998,17 +1003,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Maks. pritisak"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Max."
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Max."
@@ -1017,51 +1022,51 @@ msgstr "Max."
msgid "May"
msgstr "Svi"
-#: divelist.c:2339
+#: divelist.c:2368
#, fuzzy
msgid "Merge dives"
msgstr "Obriši urone"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Spoji s grupom iznad"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Spoji s grupom ispod"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "Metar"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Najmanja dubina"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Najmanji SAC"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Min. temp."
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Min."
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Min."
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Ostale opcije"
@@ -1077,7 +1082,7 @@ msgstr "Pon"
msgid "Multi-platform divelog software in C"
msgstr "Višeplatformski program za vođenje ronilačkog dnevnika pisan u C-u"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr ""
@@ -1085,7 +1090,7 @@ msgstr ""
msgid "New"
msgstr "Novi"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Novi početni broj"
@@ -1102,7 +1107,7 @@ msgstr "Naziv uređaja"
msgid "No Tank Data"
msgstr "Nema podatka o boci"
-#: info.c:611 info.c:725 info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Bilješke"
@@ -1114,7 +1119,7 @@ msgstr "Stu"
msgid "OLF"
msgstr ""
-#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1123,7 +1128,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "Lis"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr ""
@@ -1131,7 +1136,7 @@ msgstr ""
msgid "Ok to delete the selected entry?"
msgstr ""
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Otvori datoteku"
@@ -1139,7 +1144,7 @@ msgstr "Otvori datoteku"
msgid "Open..."
msgstr "Otvori..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr ""
@@ -1160,11 +1165,11 @@ msgstr "PO2 Upozorenje: Prebrzi izron"
msgid "PO2 Green Warning"
msgstr "PO2 Upozorenje: Zeleno"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "PSI"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr ""
@@ -1172,7 +1177,7 @@ msgstr ""
msgid "Planner"
msgstr ""
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Postavke"
@@ -1184,7 +1189,7 @@ msgstr "Postavke..."
msgid "Pressure"
msgstr "Pritisak"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Pritisak:"
@@ -1192,15 +1197,15 @@ msgstr "Pritisak:"
msgid "Prev DC"
msgstr ""
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Ispiši odabrane urone"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Ispiši odabrano"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Vrsta ispisa"
@@ -1212,7 +1217,7 @@ msgstr "Ispis..."
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
#, fuzzy
msgid "Profile Settings"
msgstr "Profil"
@@ -1229,7 +1234,7 @@ msgstr "RTG Alarm"
msgid "RGT Warning"
msgstr "RTG Upozorenje"
-#: info.c:705 info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Ocjena"
@@ -1238,19 +1243,19 @@ msgstr "Ocjena"
msgid "Reading %s %s"
msgstr "Čitanje urona %s"
-#: divelist.c:2051 divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Obriši grupu"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Ukloni uron iz grupe"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Ukloni odabrane urone iz grupe"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Renumeriraj"
@@ -1262,20 +1267,20 @@ msgstr "Renumeriraj..."
msgid "Retry"
msgstr "Pokušaj ponovo"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr ""
-#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "SAC"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr ""
-#: planner.c:1235
+#: planner.c:1257
#, fuzzy
msgid "SAC during dive"
msgstr "Dodaj uron"
@@ -1296,24 +1301,29 @@ msgstr "Sub"
msgid "Save As..."
msgstr "Spremi kao..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Spremi promjene?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Spremi datoteku kao"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Spremi kao..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Spremi..."
-#: planner.c:1140
+#: planner.c:1150
#, fuzzy
msgid "Segment Time"
msgstr "Prosj. trajanje"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
#, fuzzy
msgid "Select Events"
msgstr "Odaberi događaje"
@@ -1335,54 +1345,54 @@ msgstr ""
"Greška pri pisanju u datoteku req.txt\n"
"Je li Uemis Zurich ispravno prikopčan?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Min."
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Najkraći uron"
-#: gtk-gui.c:653 gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Prikaži stupce"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr ""
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr ""
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr ""
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr ""
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr ""
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr ""
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr ""
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr ""
-#: planner.c:191
+#: planner.c:192
#, fuzzy
msgid "Simulated Dive"
msgstr "Obriši uron"
@@ -1403,15 +1413,15 @@ msgstr "Upozorenje: Brzina"
msgid "Start"
msgstr "Početak"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr ""
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Statistika"
-#: statistics.c:705
+#: statistics.c:708
#, fuzzy, c-format
msgid "Statistics %s"
msgstr "Statistika"
@@ -1425,20 +1435,12 @@ msgstr "Statistika"
msgid "Status"
msgstr "Statistika"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-
-#: divelist.c:1422 gtk-gui.c:684 info.c:706 info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Odijelo"
@@ -1447,20 +1449,20 @@ msgstr "Odijelo"
msgid "Sun"
msgstr "Ned"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Površinski interval"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr ""
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr ""
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Tablični ispis"
@@ -1472,19 +1474,19 @@ msgstr "Preporučena izmjena boce"
msgid "Tank Pressure Info"
msgstr "Podaci od pritisku u boci"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr ""
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temp"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Temperatura"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Temperatura:"
@@ -1496,7 +1498,7 @@ msgstr "Tri"
msgid "Thu"
msgstr "Čet"
-#: info.c:1016 print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Vrijeme"
@@ -1510,21 +1512,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Uključi/isključi povećanje"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Ukupno"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Ukupno trajanje"
-#: print.c:336
+#: print.c:321
#, fuzzy, c-format
msgid "Total Weight:"
msgstr "Težina:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
@@ -1566,25 +1568,25 @@ msgstr ""
"Iskopčajte i ponovo ukopčajte uređaj\n"
"i pokušajte ponovo"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Uemis greška pri inicijalizaciji"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr ""
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr ""
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, fuzzy, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Nije uspjelo otvaranje %i datoteka"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Jedinice"
@@ -1596,19 +1598,19 @@ msgstr ""
msgid "View"
msgstr "Pregled"
-#: info.c:711 statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr ""
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Zapremnina:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr ""
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Temperatura vode"
@@ -1620,28 +1622,28 @@ msgstr ""
msgid "Wed"
msgstr "Sri"
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Težina"
-#: equipment.c:1084 print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Težina"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Težina:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML datoteka"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Godina"
-#: gtk-gui.c:1371 statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Godišnje statistike"
@@ -1650,14 +1652,11 @@ msgstr "Godišnje statistike"
msgid ""
"You already have a dive computer of this model\n"
"named %s\n"
-"Subsurface can maintain a nickname for this device to distinguish it from "
-"the existing one. The default is the model and device ID as shown below.\n"
-"If you don't want to name this dive computer click 'Cancel' and Subsurface "
-"will simply display its model as its name (which may mean that you cannot "
-"tell the two dive computers apart in the logs)."
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
msgstr ""
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1665,7 +1664,7 @@ msgstr ""
"Imate promjena koje nisu spremljene\n"
"Želite li ih spremiti prije zatvaranja datoteke?"
-#: gtk-gui.c:211 gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1674,7 +1673,8 @@ msgstr ""
"Imate promjena koje nisu spremljene u datoteci: %s \n"
"Želite li ih spremiti prije zatvaranja datoteke?"
-#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
+#: profile.c:399
#, c-format
msgid "air"
msgstr "zrak"
@@ -1719,7 +1719,7 @@ msgstr ""
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91 planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr ""
@@ -1751,37 +1751,37 @@ msgstr ""
msgid "drysuit"
msgstr ""
-#: planner.c:727
+#: planner.c:734
#, fuzzy
msgid "ean"
msgstr "Sij"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr ""
-#: statistics.c:674
+#: statistics.c:677
#, fuzzy, c-format
msgid "for dive #%d"
msgstr "Uron #%d - "
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr ""
-#: statistics.c:676
+#: statistics.c:679
#, fuzzy, c-format
msgid "for selected dive"
msgstr "Ispiši odabrane urone"
-#: statistics.c:640
+#: statistics.c:643
#, fuzzy, c-format
msgid "for selected dives"
msgstr "Ispiši odabrane urone"
-#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1809,7 +1809,7 @@ msgstr ""
msgid "jacket"
msgstr ""
-#: dive.c:141 equipment.c:1004 gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1817,7 +1817,7 @@ msgstr "kg"
msgid "l"
msgstr ""
-#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "US funte"
@@ -1825,15 +1825,15 @@ msgstr "US funte"
msgid "long john"
msgstr ""
-#: dive.c:112 info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr ""
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr ""
-#: divelist.c:1427 gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr ""
@@ -1846,11 +1846,11 @@ msgstr "Maks. dubina"
msgid "membrane"
msgstr ""
-#: divelist.c:1419 planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr ""
@@ -1860,7 +1860,7 @@ msgstr ""
msgid "more data dive id"
msgstr "više od %d dana"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "više od %d dana"
@@ -1873,16 +1873,16 @@ msgstr ""
msgid "none"
msgstr ""
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr ""
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr ""
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr ""
@@ -1944,8 +1944,7 @@ msgstr ""
msgid "unkn"
msgstr "nepoznat"
-#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "nepoznato"
diff --git a/po/it_IT.po b/po/it_IT.po
index eebdb6b1f..ff544aa02 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2012-10-20 16:23+0100\n"
"Last-Translator: Filippo Moser <filippom@gmail.com>\n"
"Language-Team: Italian\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Mese"
@@ -31,48 +31,48 @@ msgstr ""
msgid " Please select dive computer and device. "
msgstr " Selezionare il computer e la periferica"
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr ""
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "#"
-#: print.c:322
+#: print.c:307
#, fuzzy, c-format
msgid "%.*f %s"
msgstr "%.*f %s/min"
-#: print.c:267 print.c:340
+#: print.c:252 print.c:325
#, fuzzy, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s/min"
-#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr ""
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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:584
+#: print.c:575
#, 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"
@@ -84,60 +84,60 @@ 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:551
+#: statistics.c:549
#, 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:609 statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dst %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dst %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr ""
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
"CNS:%u%%"
msgstr ""
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
"Calculated ceiling %.0f %s"
msgstr ""
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
"Deco:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
"Deco:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -146,82 +146,91 @@ msgid ""
"EADD:%d%s"
msgstr ""
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
"In deco"
msgstr ""
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
"MOD:%d%s"
msgstr ""
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
"NDL:%umin"
msgstr ""
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
"P:%d %s"
msgstr ""
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
"Safetystop:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
"Safetystop:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2107
+#: planner.c:468
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
"T:%.1f %s"
msgstr ""
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
"pHe:%.2fbar"
msgstr ""
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
"pN%s:%.2fbar"
msgstr ""
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
"pO%s:%.2fbar"
msgstr ""
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) oder (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, fuzzy, c-format
msgid "(no dives)"
msgstr "Modifica Immersioni"
@@ -230,53 +239,49 @@ msgstr "Modifica Immersioni"
msgid "(nothing)"
msgstr ""
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr ""
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr ""
-#: print.c:907
-msgid "1 dive per page"
+#: planner.c:1253
+msgid "17 l/min"
msgstr ""
-#: planner.c:1231
-msgid "17 l/min"
+#: print.c:924
+msgid "2 dives per page"
msgstr ""
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr ""
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr ""
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr ""
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr ""
-#: planner.c:1203
+#: planner.c:1197
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given "
-"depth, takes the given time (if relative, e.g. '+3:30') or ends at the given "
-"time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
-"An entry that has a depth and a gas given but no time is special; it informs "
-"the planner that the gas specified is available for the ascent once the "
-"depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr ""
@@ -288,28 +293,28 @@ msgstr ""
msgid "Add Dive..."
msgstr "Aggiungi Immersione..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Aggiungi immersione"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Aggiungi al viaggio sopra"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr ""
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr ""
-#: statistics.c:844
+#: statistics.c:847
#, fuzzy
msgid "Air Temp"
msgstr "Temperatura Media"
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr ""
@@ -330,66 +335,66 @@ msgstr "Ago"
msgid "Autogroup"
msgstr "Raggruppa"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Media"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Media"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Media"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Media"
-#: statistics.c:799 statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Profondità media"
# surface air consumption (SAC)
# consumo d'aria in superficie (CAS)
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "CAS Medio"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Temperatura Media"
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Tempo Medio"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr ""
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "Bar"
-#: info.c:700 info.c:1153 print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Compagno"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr ""
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr ""
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr ""
@@ -397,11 +402,11 @@ msgstr ""
msgid "Cannot parse response!"
msgstr ""
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Selezionare il file XML di default"
@@ -413,7 +418,7 @@ msgstr "Selezionare i files XML da importare nel file dei dati"
msgid "Close"
msgstr "Chiudi"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Minimizza tutto"
@@ -425,20 +430,20 @@ msgstr ""
msgid "Connection Error: "
msgstr ""
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Crea un nuovo viaggio sopra"
# Cubic foot
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "Piedi cubi"
-#: divelist.c:1423 gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Bombola"
-#: equipment.c:918 equipment.c:1029 print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Bombola"
@@ -446,20 +451,24 @@ msgstr "Bombola"
msgid "Cylinders"
msgstr "Bombole"
-#: profile.c:2098
+#: profile.c:2102
#, fuzzy, c-format
msgid "D:%.1f %s"
msgstr "%.*f %s/min"
-#: divelist.c:1416 print.c:510 statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Data"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Data e Tempo"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Data:"
@@ -467,7 +476,7 @@ msgstr "Data:"
msgid "Dec"
msgstr "Dic"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "File XML di default"
@@ -475,19 +484,19 @@ msgstr "File XML di default"
msgid "Delete a dive computer information entry"
msgstr ""
-#: divelist.c:2206 divelist.c:2259 divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Cancella immersione"
-#: divelist.c:2208 divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Cancella immersioni"
-#: print.c:510 statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Profondità"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Profondità (%s):"
@@ -496,7 +505,7 @@ msgstr "Profondità (%s):"
msgid "Depth Limit Exceeded"
msgstr "Limite Profondità Superato"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Profondità:"
@@ -515,12 +524,12 @@ msgstr ""
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Immersione #%1$d - %2$s %4$02d.%3$02d.%5$04d a %6$d:%7$02d"
-#: info.c:157 print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Immersione #%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Immersione #%d: %s %d %04d"
@@ -530,7 +539,7 @@ msgstr "Immersione #%d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Computer"
-#: gtk-gui.c:1607 info.c:898 statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Informazioni sull'immersione"
@@ -538,11 +547,11 @@ msgstr "Informazioni sull'immersione"
msgid "Dive Notes"
msgstr "Note dell'immersione"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr ""
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Tempo d'Immersione"
@@ -558,11 +567,11 @@ msgstr "Info: Tempo d'Immersione"
msgid "Dive computer vendor and product"
msgstr ""
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr ""
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Dettagli immersione"
@@ -571,27 +580,27 @@ msgstr "Dettagli immersione"
msgid "Dive locations"
msgstr "Note dell'immersione"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Dive master"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr ""
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Immersione n."
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Carattere Immersione"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Immersioni"
@@ -622,28 +631,28 @@ msgstr "Scarica dal Computer..."
msgid "Download Success!"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Durata"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Durata (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr ""
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr ""
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr ""
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr ""
@@ -660,42 +669,40 @@ msgstr "Nome periferica"
msgid "Edit Dive Computer Nicknames"
msgstr ""
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Modifica Informazioni Viaggio"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Modifica Riepilogo Viaggio"
#: gtk-gui.c:1302
-msgid ""
-"Edit a dive computer nickname by double-clicking the in the relevant "
-"nickname field"
+msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr ""
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Modifica Immersione"
-#: divelist.c:2405 divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
#, fuzzy
msgid "Edit dive date/time"
msgstr "Modifica Immersione"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Modifica Immersioni"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Modifica più immerisoni"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Modifica il riepilogo di viaggio"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Abilita / Disabilita Eventi"
@@ -703,79 +710,77 @@ msgstr "Abilita / Disabilita Eventi"
msgid "End"
msgstr "Fine"
-#: planner.c:1139
+#: planner.c:1149
#, fuzzy
msgid "Ending Depth"
msgstr "Profondità Minima"
#: webservice.c:220
-msgid ""
-"Enter a user identifier and press 'Download'. Once the download is complete "
-"you can press 'Apply' if you wish to apply the changes."
+msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr ""
-#: gtk-gui.c:1603 info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Attrezzatura"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr ""
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr ""
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr ""
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr ""
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr ""
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr ""
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr ""
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr ""
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr ""
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr ""
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr ""
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr ""
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Espandi tutto"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Impossibile aprire i file %i"
@@ -790,12 +795,12 @@ msgstr "Impossibile analizzare '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Impossibile analizzare '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Impossibile leggere '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Impossibile leggere '%s'.\n"
@@ -804,7 +809,7 @@ msgstr "Impossibile leggere '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "Piedi"
@@ -824,48 +829,48 @@ msgstr ""
msgid "Fri"
msgstr "Ven"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr ""
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr ""
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr ""
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr ""
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr ""
-#: statistics.c:854
+#: statistics.c:857
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gas Usato"
-#: planner.c:1141
+#: planner.c:1151
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gas Usato"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr ""
-#: equipment.c:959 print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Miscela di gas"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr ""
@@ -885,7 +890,7 @@ msgstr "Importa file(s) XML..."
msgid "Info"
msgstr "Informazioni"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr ""
@@ -919,11 +924,11 @@ msgstr "Linus Torvalds, Dirk Hohndel e altri, 2011, 2012"
msgid "List"
msgstr "Lista"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "Litri"
-#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Luogo"
@@ -931,12 +936,12 @@ msgstr "Luogo"
msgid "Log"
msgstr "Log"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Più lunga"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Immersione più lunga"
@@ -960,7 +965,7 @@ msgstr ""
msgid "Marker"
msgstr "Marcatore"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Master"
@@ -968,19 +973,19 @@ msgstr "Master"
msgid "Max Deco Time Warning"
msgstr "Avviso: Massimo tempo di decompressione"
-#: statistics.c:797 statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Profondità Massima"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "CAS Massimo"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Temperatura Massima"
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -991,7 +996,7 @@ msgstr ""
"Durata: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr ""
@@ -1000,17 +1005,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Pressione Massima"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Massimo"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Massimo"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Massimo"
@@ -1019,51 +1024,51 @@ msgstr "Massimo"
msgid "May"
msgstr "Mag"
-#: divelist.c:2339
+#: divelist.c:2368
#, fuzzy
msgid "Merge dives"
msgstr "Cancella immersioni"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Raggruppa il viaggio con il viaggio sopra"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Raggruppa il viaggio con il viaggio sotto"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "Metro"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Profondità Minima"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Min. CAS"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Temperatura Minima"
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimo"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimo"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimo"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Opzioni"
@@ -1079,7 +1084,7 @@ msgstr "Lun"
msgid "Multi-platform divelog software in C"
msgstr "Programma Multi-piattaforma in C per il log delle immersioni"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr ""
@@ -1087,7 +1092,7 @@ msgstr ""
msgid "New"
msgstr "Nuovo"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Nuovo numero di inizio"
@@ -1104,7 +1109,7 @@ msgstr "Nome periferica"
msgid "No Tank Data"
msgstr "Nessun dato sulla bombola"
-#: info.c:611 info.c:725 info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Note"
@@ -1116,7 +1121,7 @@ msgstr "Nov"
msgid "OLF"
msgstr ""
-#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1125,7 +1130,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "Ott"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr ""
@@ -1133,7 +1138,7 @@ msgstr ""
msgid "Ok to delete the selected entry?"
msgstr ""
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Apri File"
@@ -1141,7 +1146,7 @@ msgstr "Apri File"
msgid "Open..."
msgstr "Apri..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr ""
@@ -1162,11 +1167,11 @@ msgstr "Avviso Incremento PO2"
msgid "PO2 Green Warning"
msgstr "Avviso PO2 Verde"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "PSI"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr ""
@@ -1174,7 +1179,7 @@ msgstr ""
msgid "Planner"
msgstr ""
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Preferenze"
@@ -1186,7 +1191,7 @@ msgstr "Preferenze..."
msgid "Pressure"
msgstr "Pressione"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Pressione:"
@@ -1194,15 +1199,15 @@ msgstr "Pressione:"
msgid "Prev DC"
msgstr ""
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Stampa solo le immersioni selezionate"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Stampa selezione"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Stampa tipo"
@@ -1214,7 +1219,7 @@ msgstr "Stampa..."
msgid "Profile"
msgstr "Profilo"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
#, fuzzy
msgid "Profile Settings"
msgstr "Profilo"
@@ -1232,7 +1237,7 @@ msgstr "Allarme RGT"
msgid "RGT Warning"
msgstr "Avviso RGT"
-#: info.c:705 info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Valutazione"
@@ -1241,19 +1246,19 @@ msgstr "Valutazione"
msgid "Reading %s %s"
msgstr "Lettura immersione %s in corso"
-#: divelist.c:2051 divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Rimuovi Viaggio"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Rimuovi immersione dal viaggio"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Rimuovi le immersioni selezionate dal viaggio"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Rinumera"
@@ -1265,21 +1270,21 @@ msgstr "Rinumera..."
msgid "Retry"
msgstr "Riprova"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr ""
# SAC surface air consumption
-#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "CAS"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr ""
-#: planner.c:1235
+#: planner.c:1257
#, fuzzy
msgid "SAC during dive"
msgstr "Aggiungi immersione"
@@ -1300,24 +1305,29 @@ msgstr "Sab"
msgid "Save As..."
msgstr "Salva Come..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Salvare le modifiche?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Salvare il File come"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Salva Come..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Salva..."
-#: planner.c:1140
+#: planner.c:1150
#, fuzzy
msgid "Segment Time"
msgstr "Tempo Medio"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
#, fuzzy
msgid "Select Events"
msgstr "Seleziona Eventi"
@@ -1339,54 +1349,54 @@ msgstr ""
"Scrittura breve sul file req.txt\n"
"Lo Uemis Zurich e' collegato correttamente?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Più corto"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Immersione più corta"
-#: gtk-gui.c:653 gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Visualizza Colonne"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr ""
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr ""
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr ""
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr ""
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr ""
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr ""
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr ""
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr ""
-#: planner.c:191
+#: planner.c:192
#, fuzzy
msgid "Simulated Dive"
msgstr "Cancella Immersione"
@@ -1407,15 +1417,15 @@ msgstr "Avviso Risalita Veloce"
msgid "Start"
msgstr "Inizio"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr ""
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Statistiche"
-#: statistics.c:705
+#: statistics.c:708
#, fuzzy, c-format
msgid "Statistics %s"
msgstr "Statistiche"
@@ -1429,20 +1439,12 @@ msgstr "Statistiche"
msgid "Status"
msgstr "Statistiche"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-
-#: divelist.c:1422 gtk-gui.c:684 info.c:706 info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Muta"
@@ -1451,20 +1453,20 @@ msgstr "Muta"
msgid "Sun"
msgstr "Dom"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Intervallo di Superficie"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr ""
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr ""
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Stampa Tabella"
@@ -1476,19 +1478,19 @@ msgstr "Suggerito Cambio Bombola"
msgid "Tank Pressure Info"
msgstr "Informazione Pressione della bombola"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr ""
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temperatura"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Temperatura"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Temperatura:"
@@ -1500,7 +1502,7 @@ msgstr "Albero"
msgid "Thu"
msgstr "Gio"
-#: info.c:1016 print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Tempo"
@@ -1514,21 +1516,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Zoom Alternativo"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Totale"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Tempo Totale"
-#: print.c:336
+#: print.c:321
#, fuzzy, c-format
msgid "Total Weight:"
msgstr "Peso:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
@@ -1570,25 +1572,25 @@ msgstr ""
"Disconnettere/connettere il computer\n"
"e riprovare"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Impossibile inizializzare l'Uemis"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr ""
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr ""
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, fuzzy, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Impossibile aprire i file %i"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Unità"
@@ -1600,19 +1602,19 @@ msgstr ""
msgid "View"
msgstr "Visualizza"
-#: info.c:711 statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr ""
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Volume:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr ""
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Temperatura dell'acqua"
@@ -1624,28 +1626,28 @@ msgstr ""
msgid "Wed"
msgstr "Mer"
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Peso"
-#: equipment.c:1084 print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Sistema di Zavorra"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Peso:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "File XML"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Anno"
-#: gtk-gui.c:1371 statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Statistiche Annuali"
@@ -1654,14 +1656,11 @@ msgstr "Statistiche Annuali"
msgid ""
"You already have a dive computer of this model\n"
"named %s\n"
-"Subsurface can maintain a nickname for this device to distinguish it from "
-"the existing one. The default is the model and device ID as shown below.\n"
-"If you don't want to name this dive computer click 'Cancel' and Subsurface "
-"will simply display its model as its name (which may mean that you cannot "
-"tell the two dive computers apart in the logs)."
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
msgstr ""
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1669,7 +1668,7 @@ msgstr ""
"Non hai salvato le modifiche.\n"
"Vuoi salvare prima di chiudere il file dei dati?"
-#: gtk-gui.c:211 gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1678,7 +1677,8 @@ msgstr ""
"Non hai salvato le modifiche al file %s.\n"
"Vuoi salvare prima di chiudere il file dei dati?"
-#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
+#: profile.c:399
#, c-format
msgid "air"
msgstr "aria"
@@ -1723,7 +1723,7 @@ msgstr ""
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91 planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "piedi cubi"
@@ -1755,37 +1755,37 @@ msgstr ""
msgid "drysuit"
msgstr ""
-#: planner.c:727
+#: planner.c:734
#, fuzzy
msgid "ean"
msgstr "Gen"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr ""
-#: statistics.c:674
+#: statistics.c:677
#, fuzzy, c-format
msgid "for dive #%d"
msgstr "Immersione #%d - "
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr ""
-#: statistics.c:676
+#: statistics.c:679
#, fuzzy, c-format
msgid "for selected dive"
msgstr "Stampa solo le immersioni selezionate"
-#: statistics.c:640
+#: statistics.c:643
#, fuzzy, c-format
msgid "for selected dives"
msgstr "Stampa solo le immersioni selezionate"
-#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1813,7 +1813,7 @@ msgstr ""
msgid "jacket"
msgstr ""
-#: dive.c:141 equipment.c:1004 gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1821,7 +1821,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "lbs"
@@ -1829,15 +1829,15 @@ msgstr "lbs"
msgid "long john"
msgstr ""
-#: dive.c:112 info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr ""
-#: divelist.c:1427 gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr ""
@@ -1850,11 +1850,11 @@ msgstr "Profondità Massima"
msgid "membrane"
msgstr ""
-#: divelist.c:1419 planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr ""
@@ -1864,7 +1864,7 @@ msgstr ""
msgid "more data dive id"
msgstr "più di %d giorni"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "più di %d giorni"
@@ -1877,16 +1877,16 @@ msgstr ""
msgid "none"
msgstr ""
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr ""
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr ""
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr ""
@@ -1948,8 +1948,7 @@ msgstr ""
msgid "unkn"
msgstr "sconosciuto"
-#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "sconosciuto"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 492963716..c3ee69273 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2013-02-05 09:34+0100\n"
"Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
"Language-Team: Norwegian Bokmål\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Måned"
@@ -32,48 +32,48 @@ msgstr "Last ned"
msgid " Please select dive computer and device. "
msgstr " Velg dykkecomputer og enhet"
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr " start"
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr " slutt"
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "#"
-#: print.c:322
+#: print.c:307
#, c-format
msgid "%.*f %s"
msgstr "%.*f %s"
-#: print.c:267 print.c:340
+#: print.c:252 print.c:325
#, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s\n"
-#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr "%.0f%s av %s\n"
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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:584
+#: print.c:575
#, 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"
@@ -85,32 +85,32 @@ 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:551
+#: statistics.c:549
#, 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:609 statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dt %dt %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dt %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr "%s"
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
@@ -119,7 +119,7 @@ msgstr ""
"%s\n"
"CNS:%u%%"
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
@@ -128,7 +128,7 @@ msgstr ""
"%s\n"
"Kalkulert tak %.0f %s"
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
@@ -137,7 +137,7 @@ msgstr ""
"%s\n"
"Deko:%umin @ %.0f %s"
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
@@ -146,7 +146,7 @@ msgstr ""
"%s\n"
"Deko:ukjent tid @ %.0f %s"
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -159,7 +159,7 @@ msgstr ""
"END:%d%s\n"
"EADD:%d%s"
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
@@ -168,7 +168,7 @@ msgstr ""
"%s\n"
"I deko"
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
@@ -177,7 +177,7 @@ msgstr ""
"%s\n"
"MOD:%d%s"
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
@@ -186,7 +186,7 @@ msgstr ""
"%s\n"
"NDL:%umin"
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
@@ -195,7 +195,7 @@ msgstr ""
"%s\n"
"P:%d %s"
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
@@ -204,7 +204,7 @@ msgstr ""
"%s\n"
"Sikkerhetsstopp:%umin @ %.0f %s"
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
@@ -213,7 +213,19 @@ msgstr ""
"%s\n"
"Sikkerhetsstopp: ukjent tid @ %.0f %s"
-#: profile.c:2107
+#: planner.c:468
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+"Subsurface dykkeplan\n"
+"basert på GFlow = %.0f og GFhigh = %.0f\n"
+"\n"
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
@@ -222,7 +234,7 @@ msgstr ""
"%s\n"
"T:%.1f %s"
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
@@ -231,7 +243,7 @@ msgstr ""
"%s\n"
"pHe:%.2fbar"
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
@@ -240,7 +252,7 @@ msgstr ""
"%s\n"
"pN%s:%.2fbar"
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
@@ -249,12 +261,12 @@ msgstr ""
"%s\n"
"pO%s:%.2fbar"
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) eller (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, c-format
msgid "(no dives)"
msgstr "(ingen dykk)"
@@ -263,64 +275,57 @@ msgstr "(ingen dykk)"
msgid "(nothing)"
msgstr "(ingenting)"
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr "0.6 ft³/min"
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr "0.7 ft³/min"
-#: print.c:907
-msgid "1 dive per page"
-msgstr "1 dykk per side"
-
-#: planner.c:1231
+#: planner.c:1253
msgid "17 l/min"
msgstr "17 l/min"
+#: print.c:924
+#, fuzzy
+msgid "2 dives per page"
+msgstr "6 dykk per side"
+
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr "todelt vams"
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr "20 l/min"
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr "3m intervaller for kalkulert tak"
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr "6 dykk per side"
-#: planner.c:1203
+#: planner.c:1197
+#, fuzzy
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given "
-"depth, takes the given time (if relative, e.g. '+3:30') or ends at the given "
-"time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
-"An entry that has a depth and a gas given but no time is special; it informs "
-"the planner that the gas specified is available for the ascent once the "
-"depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
"<small>Legg til segmenter.\n"
"Hver rad beskriver en del av det planlagte dykket.\n"
-"En rad med dybde, tid og gass beskriver et segment som slutter på den gitte "
-"dybden, tar den gitte tiden (f.eks relativ tid som '+3:30') eller slutter på "
-"den gitte tiden (hvis absolutt), og bruker den gitte gassen.\n"
-"Et tomt gassfelt betyr 'bruk forrige gass' (eller luft hvis det ikke var "
-"noen tidligere gass).\n"
-"En rad som har dybde og gass, men ikke tid er spesiell: planleggeren vet da "
-"at gassen er tilgjengelig når den oppgitte dybden nåes.\n"
-"CC setpoint spesifiserer rebreather-dykk, ikke bruk ved åpent system (OC).</"
-"small>"
-
-#: planner.c:1113
+"En rad med dybde, tid og gass beskriver et segment som slutter på den gitte dybden, tar den gitte tiden (f.eks relativ tid som '+3:30') eller slutter på den gitte tiden (hvis absolutt), og bruker den gitte gassen.\n"
+"Et tomt gassfelt betyr 'bruk forrige gass' (eller luft hvis det ikke var noen tidligere gass).\n"
+"En rad som har dybde og gass, men ikke tid er spesiell: planleggeren vet da at gassen er tilgjengelig når den oppgitte dybden nåes.\n"
+"CC setpoint spesifiserer rebreather-dykk, ikke bruk ved åpent system (OC).</small>"
+
+#: planner.c:1123
msgid "AIR"
msgstr "Luft"
@@ -332,27 +337,27 @@ msgstr "Om Subsurface"
msgid "Add Dive..."
msgstr "Nytt dykk..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Nytt dykk"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Slå sammen med turen over"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr "Legg til rad"
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr "Lufttrykk"
-#: statistics.c:844
+#: statistics.c:847
msgid "Air Temp"
msgstr "Lufttemp."
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr "Lufttemp i %s"
@@ -373,64 +378,64 @@ msgstr "aug"
msgid "Autogroup"
msgstr "Grupper automatisk"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Gjennomsnitt"
-#: statistics.c:799 statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Snittdybde"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Snitt-SAC"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Snitt-temp."
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Snitt-tid"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr "Bytter til OC"
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "bar"
-#: info.c:700 info.c:1153 print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Buddy"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr "CC setpoint"
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr "Avbrutt, går ut..."
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr "Avbrutt..."
@@ -438,11 +443,11 @@ msgstr "Avbrutt..."
msgid "Cannot parse response!"
msgstr "Kan ikke lese svar!"
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Velg standard XML-fil"
@@ -454,7 +459,7 @@ msgstr "Velg hvilke XML-filer du vil importere"
msgid "Close"
msgstr "Lukk"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Slå sammen alle"
@@ -466,19 +471,19 @@ msgstr "Kobler til..."
msgid "Connection Error: "
msgstr "Feil med forbindelse"
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Lag ny tur over denne"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "ft³"
-#: divelist.c:1423 gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Flaske"
-#: equipment.c:918 equipment.c:1029 print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Flaske"
@@ -486,20 +491,24 @@ msgstr "Flaske"
msgid "Cylinders"
msgstr "Flasker"
-#: profile.c:2098
+#: profile.c:2102
#, c-format
msgid "D:%.1f %s"
msgstr "D:%.1f %s"
-#: divelist.c:1416 print.c:510 statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Dato"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Dato og tid"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Dato:"
@@ -507,7 +516,7 @@ msgstr "Dato:"
msgid "Dec"
msgstr "des"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Standard XML-fil"
@@ -515,19 +524,19 @@ msgstr "Standard XML-fil"
msgid "Delete a dive computer information entry"
msgstr "Slett informasjon om dykkecomputer"
-#: divelist.c:2206 divelist.c:2259 divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Slett dykk"
-#: divelist.c:2208 divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Slett dykk"
-#: print.c:510 statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Dybde"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Dybde (%s):"
@@ -536,7 +545,7 @@ msgstr "Dybde (%s):"
msgid "Depth Limit Exceeded"
msgstr "Maksgrense for dybde overskredet"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Dybde:"
@@ -554,12 +563,12 @@ msgstr "Enhet eller disk"
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Dykk #%1$d - %2$s %4$02d-%3$02d-%5$04d, %6$d:%7$02d"
-#: info.c:157 print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Dykk #%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Dykk #%d: %s %d %04d"
@@ -568,7 +577,7 @@ msgstr "Dykk #%d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Navn på dykkecomputer"
-#: gtk-gui.c:1607 info.c:898 statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Informasjon"
@@ -576,11 +585,11 @@ msgstr "Informasjon"
msgid "Dive Notes"
msgstr "Dykk"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr "Dykkeplan - DETTE ER KUN EN SIMULERING, IKKE BRUK TIL DYKKING"
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Starttid"
@@ -596,11 +605,11 @@ msgstr "Info: dykketid"
msgid "Dive computer vendor and product"
msgstr "Dykkecomputerleverandør og -modell"
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Feil ved import av dykkedata"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Detaljer"
@@ -608,27 +617,27 @@ msgstr "Detaljer"
msgid "Dive locations"
msgstr "Dykkesteder"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Dykkeleder"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr "Når starter dykket?"
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Dykk nr."
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Skrifttype for liste"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Dykkeleder"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Dykk"
@@ -656,28 +665,28 @@ msgstr "Last ned fra nettsted…"
msgid "Download Success!"
msgstr "Ferdig å laste ned"
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Varighet"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Varighet (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr "Ø"
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr "EAN%d"
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr "EAN32"
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr "EAN36"
@@ -693,41 +702,39 @@ msgstr "Rediger enhetsnavn"
msgid "Edit Dive Computer Nicknames"
msgstr "Rediger navn for dykkecomputer"
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Rediger turinformasjon"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Rediger tursammendrag"
#: gtk-gui.c:1302
-msgid ""
-"Edit a dive computer nickname by double-clicking the in the relevant "
-"nickname field"
+msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr "Dobbeltklikk felter ved dobbeltklikke på dem"
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Rediger dykk"
-#: divelist.c:2405 divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
msgid "Edit dive date/time"
msgstr "Rediger dato og tid"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Rediger dykk"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Rediger flere dykk"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Rediger tursammendrag"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Skru på/av hendelser"
@@ -735,80 +742,76 @@ msgstr "Skru på/av hendelser"
msgid "End"
msgstr "Slutt"
-#: planner.c:1139
+#: planner.c:1149
msgid "Ending Depth"
msgstr "Sluttdybde"
#: webservice.c:220
-msgid ""
-"Enter a user identifier and press 'Download'. Once the download is complete "
-"you can press 'Apply' if you wish to apply the changes."
-msgstr ""
-"Skriv inn brukeridentifikator og trykk 'Last ned'. Trykk 'Bruk' når "
-"nedlastinga er ferdig hvis du vil lagre endringene."
+msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+msgstr "Skriv inn brukeridentifikator og trykk 'Last ned'. Trykk 'Bruk' når nedlastinga er ferdig hvis du vil lagre endringene."
-#: gtk-gui.c:1603 info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Utstyr"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr "Feil ved lesing av salthetsgrad"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Feil ved lesing av dato"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Feil ved lesing av dykketid"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Feil ved lesing av gassmiks"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Feil ved lesing av gassmiksantall"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Feil ved lesing av maksdybde"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Feil ved lesing av detaljer"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Feil ved registrering av avbruddshåndterer."
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Feil ved registrering av data"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Feil ved registrering av hendelseshåndterer."
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Hendelse: systime%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Hendelse: Venter på bruker"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Ekspander alle"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Fikk ikke åpnet %i filer."
@@ -823,12 +826,12 @@ msgstr "Kunne ikke lese '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Kunne ikke lese '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Kunne ikke åpne '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Kunne ikke åpne '%s'.\n"
@@ -837,7 +840,7 @@ msgstr "Kunne ikke åpne '%s'.\n"
msgid "Feb"
msgstr "feb"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "fot"
@@ -857,46 +860,46 @@ msgstr "Tvungen nedlasting av alle dykk"
msgid "Fri"
msgstr "fre"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr "GFhigh"
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr "GFhigh for plan"
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr "GFlow"
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr "GFlow for plan"
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (WGS84- eller GPS-format)"
-#: statistics.c:854
+#: statistics.c:857
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gassforbruk"
-#: planner.c:1141
+#: planner.c:1151
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gass"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr "Gasskonsum:\n"
-#: equipment.c:959 print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Gassmiks"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr "Generelle innstillinger"
@@ -916,7 +919,7 @@ msgstr "Importer XML-fil(er)..."
msgid "Info"
msgstr "Info"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr "Start kommunikasjon"
@@ -949,11 +952,11 @@ msgstr "Linus Torvalds, Dirk Hohndel med flere, 2011, 2012, 2013"
msgid "List"
msgstr "Liste"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "liter"
-#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Sted"
@@ -961,12 +964,12 @@ msgstr "Sted"
msgid "Log"
msgstr "Logg"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Lengste"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Lengste dykk"
@@ -990,7 +993,7 @@ msgstr "Sett posisjon her"
msgid "Marker"
msgstr "markering"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "master"
@@ -998,19 +1001,19 @@ msgstr "master"
msgid "Max Deco Time Warning"
msgstr "Advarsel: maks dekotid"
-#: statistics.c:797 statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Maks. dybde"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Maks. SAC"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Maks. temp."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -1021,7 +1024,7 @@ msgstr ""
"Tid: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr "Maks CNS"
@@ -1030,17 +1033,17 @@ msgstr "Maks CNS"
msgid "MaxPress"
msgstr "Maks. trykk"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Maksimum"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Maksimum"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Maksimum"
@@ -1049,50 +1052,50 @@ msgstr "Maksimum"
msgid "May"
msgstr "mai"
-#: divelist.c:2339
+#: divelist.c:2368
msgid "Merge dives"
msgstr "Slå sammen dykk"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Slå samme tur med turen over"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Slå sammen tur med turen under"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "meter"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Min. dybde"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Min. temp"
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Ymse valg"
@@ -1108,7 +1111,7 @@ msgstr "man"
msgid "Multi-platform divelog software in C"
msgstr "Dykkelogg i C for flere plattformer"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr "N"
@@ -1116,7 +1119,7 @@ msgstr "N"
msgid "New"
msgstr "Ny"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Nytt startnummer"
@@ -1132,7 +1135,7 @@ msgstr "Navn"
msgid "No Tank Data"
msgstr "Ingen tankinformasjon"
-#: info.c:611 info.c:725 info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Notater"
@@ -1144,7 +1147,7 @@ msgstr "nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1153,7 +1156,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "okt"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Feil ved retur fra pthread"
@@ -1161,7 +1164,7 @@ msgstr "Feil ved retur fra pthread"
msgid "Ok to delete the selected entry?"
msgstr "Er det greit å slette valgte oppføring?"
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Åpne fil"
@@ -1169,7 +1172,7 @@ msgstr "Åpne fil"
msgid "Open..."
msgstr "Åpne..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr "Oksygen"
@@ -1190,11 +1193,11 @@ msgstr "Advarsel: oppstigning /PO2"
msgid "PO2 Green Warning"
msgstr "Advarsel: grønn / PO2"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "psi"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr "Velg på kart"
@@ -1202,7 +1205,7 @@ msgstr "Velg på kart"
msgid "Planner"
msgstr "Planlegger"
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Valg"
@@ -1214,7 +1217,7 @@ msgstr "Valg..."
msgid "Pressure"
msgstr "Trykk"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Trykk:"
@@ -1222,15 +1225,15 @@ msgstr "Trykk:"
msgid "Prev DC"
msgstr "Forrige DC"
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Skriv ut valgte dykk"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Skriv ut valg"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Utskriftstype"
@@ -1242,7 +1245,7 @@ msgstr "Skriv ut..."
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
msgid "Profile Settings"
msgstr "Profilinnstillinger"
@@ -1258,7 +1261,7 @@ msgstr "Alarm: gjenværende gasstid"
msgid "RGT Warning"
msgstr "Advarsel: gjenværende gasstid"
-#: info.c:705 info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Vurdering"
@@ -1267,19 +1270,19 @@ msgstr "Vurdering"
msgid "Reading %s %s"
msgstr "Leser %s %s"
-#: divelist.c:2051 divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Fjern tur"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Fjern dykk fra tur"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Fjern valgte dykk fra tur"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Oppdater nummerering"
@@ -1291,20 +1294,20 @@ msgstr "Oppdater nummerering..."
msgid "Retry"
msgstr "Prøv igjen"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr "S"
-#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "SAC"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr "SAC under dekostopp"
-#: planner.c:1235
+#: planner.c:1257
msgid "SAC during dive"
msgstr "SAC under dykk"
@@ -1324,23 +1327,28 @@ msgstr "lør"
msgid "Save As..."
msgstr "Lagre som..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Lagre endringer?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Lagre fil som"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Lagre som..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Lagre..."
-#: planner.c:1140
+#: planner.c:1150
msgid "Segment Time"
msgstr "Deltid"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
msgid "Select Events"
msgstr "Velg hendelser"
@@ -1360,54 +1368,54 @@ msgstr ""
"Fikk ikke skrevet ferdig req.txt\n"
"Er Uemis Zurich plugget i ordentlig?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Korteste"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Korteste dykk"
-#: gtk-gui.c:653 gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Vis kolonner"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr "Vis EAD, END, EADD"
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr "Vis MOD"
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr "Vis kalkulert tak"
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr "Tak fra DC i rødt"
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr "Vis i kart"
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr "Vis graf for pHe"
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr "Vis graf for pN%s"
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr "Vis graf for pO%s"
-#: planner.c:191
+#: planner.c:192
msgid "Simulated Dive"
msgstr "Simulert dykk"
@@ -1427,15 +1435,15 @@ msgstr "Advarsel: oppstigningshastighet"
msgid "Start"
msgstr "Start"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr "Start nedlasting"
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Statistikk"
-#: statistics.c:705
+#: statistics.c:708
#, c-format
msgid "Statistics %s"
msgstr "Statistikk %s"
@@ -1448,23 +1456,12 @@ msgstr "Statistikk"
msgid "Status"
msgstr "Status"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Vis ved %.*f %s for %d:%02d min - kjøretid %d:%02u på %s\n"
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-"Subsurface dykkeplan\n"
-"basert på GFlow = %.0f og GFhigh = %.0f\n"
-"\n"
-
-#: divelist.c:1422 gtk-gui.c:684 info.c:706 info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Drakt"
@@ -1473,20 +1470,20 @@ msgstr "Drakt"
msgid "Sun"
msgstr "søn"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Overflateintervall"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr "Overflatetrykk (mbar)"
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr "Bytt gass til %s\n"
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Tabellutskrift"
@@ -1498,19 +1495,19 @@ msgstr "Tankbytte foreslått"
msgid "Tank Pressure Info"
msgstr "Info: trykk"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr "Tec-innstillinger"
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temp"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Temperatur:"
@@ -1522,7 +1519,7 @@ msgstr "Alle"
msgid "Thu"
msgstr "tor"
-#: info.c:1016 print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Tid"
@@ -1538,21 +1535,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Zoom av/på"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Total tid"
-#: print.c:336
+#: print.c:321
#, c-format
msgid "Total Weight:"
msgstr "Total vekt:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s\n"
@@ -1593,25 +1590,25 @@ msgstr ""
"Koble fra og til dykkecomputeren\n"
"og prøv igjen"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Klarer ikke å lese fra Uemis"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Kunne ikke opprette kontekst for libdivecomputer"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Kunne ikke lage parser for %s %s"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Fikk ikke åpnet %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Enheter"
@@ -1623,19 +1620,19 @@ msgstr "Brukeridentifikator"
msgid "View"
msgstr "Vis"
-#: info.c:711 statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr "Sikt"
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Volum:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr "V"
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Vanntemperatur"
@@ -1647,28 +1644,28 @@ msgstr "Nettjeneste"
msgid "Wed"
msgstr "ons"
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Vekt"
-#: equipment.c:1084 print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Vektsystem"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Vekt:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML-fil"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "År"
-#: gtk-gui.c:1371 statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Årsstatistikk"
@@ -1677,21 +1674,15 @@ msgstr "Årsstatistikk"
msgid ""
"You already have a dive computer of this model\n"
"named %s\n"
-"Subsurface can maintain a nickname for this device to distinguish it from "
-"the existing one. The default is the model and device ID as shown below.\n"
-"If you don't want to name this dive computer click 'Cancel' and Subsurface "
-"will simply display its model as its name (which may mean that you cannot "
-"tell the two dive computers apart in the logs)."
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
msgstr ""
"Du har allerede en dykkecomputer med denne\n"
"modellen ved navn %s\n"
-"Subsurface kan vedlikeholde et navn for denne computeren for å skille den "
-"fra en annen. Standarden er modell og enhets-ID som vist under.\n"
-"Hvis du ikke har lyst til å gi et navn til denne computeren, trykk 'Avbryt' "
-"og Subsurface vil vise modellen som navn. Dette kan bety at du ikke ser "
-"forskjell på to like computere i loggen."
+"Subsurface kan vedlikeholde et navn for denne computeren for å skille den fra en annen. Standarden er modell og enhets-ID som vist under.\n"
+"Hvis du ikke har lyst til å gi et navn til denne computeren, trykk 'Avbryt' og Subsurface vil vise modellen som navn. Dette kan bety at du ikke ser forskjell på to like computere i loggen."
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1699,7 +1690,7 @@ msgstr ""
"Du har endringer som ikke er lagret.\n"
"Vil du lagre disse før du lukker datafila?"
-#: gtk-gui.c:211 gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1708,7 +1699,8 @@ msgstr ""
"Du har endringer som ikke er lagret i %s.\n"
"Vil du lagre disse før du lukker fila?"
-#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
+#: profile.c:399
#, c-format
msgid "air"
msgstr "luft"
@@ -1753,7 +1745,7 @@ msgstr "tak (sikkerhetsstopp)"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91 planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "ft³"
@@ -1785,36 +1777,36 @@ msgstr "dykketid"
msgid "drysuit"
msgstr "tørrdrakt"
-#: planner.c:727
+#: planner.c:734
msgid "ean"
msgstr "ean"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr "for alle dykk"
-#: statistics.c:674
+#: statistics.c:677
#, c-format
msgid "for dive #%d"
msgstr "for dykk #%d"
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr "for dykk #"
-#: statistics.c:676
+#: statistics.c:679
#, c-format
msgid "for selected dive"
msgstr "for valgte dykk"
-#: statistics.c:640
+#: statistics.c:643
#, c-format
msgid "for selected dives"
msgstr "for valgte dykk"
-#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1842,7 +1834,7 @@ msgstr "ugyldig hendelsesnummer"
msgid "jacket"
msgstr "BCD"
-#: dive.c:141 equipment.c:1004 gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1850,7 +1842,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "pund"
@@ -1858,15 +1850,15 @@ msgstr "pund"
msgid "long john"
msgstr "stillongs"
-#: dive.c:112 info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr "maks ppO₂"
-#: divelist.c:1427 gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr "maks CNS"
@@ -1878,11 +1870,11 @@ msgstr "maksdybde"
msgid "membrane"
msgstr "skalldrakt"
-#: divelist.c:1419 planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "Min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)"
@@ -1891,7 +1883,7 @@ msgstr "modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)"
msgid "more data dive id"
msgstr "mer data dykke-id"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "mer enn %d dager"
@@ -1904,16 +1896,16 @@ msgstr "tid uten stopp"
msgid "none"
msgstr "ingen"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr "grense for pHe"
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr "grense for pN%s"
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr "grense for pO%s"
@@ -1975,8 +1967,7 @@ msgstr "sender"
msgid "unkn"
msgstr "ukjent"
-#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "ukjent"
@@ -2004,6 +1995,9 @@ msgstr "våtdrakt"
msgid "workload"
msgstr "arbeidsbelastning"
+#~ msgid "1 dive per page"
+#~ msgstr "1 dykk per side"
+
#~ msgid "About"
#~ msgstr "Om"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 7b6a6b261..99886622a 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: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2013-02-08 21:40+0100\n"
"Last-Translator: Reinout Hoornweg <reinout@xs4all.nl>\n"
"Language-Team: Dutch\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Maand"
@@ -32,48 +32,48 @@ msgstr "Download"
msgid " Please select dive computer and device. "
msgstr " Selecteer duikcomputer en aansluiting. "
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr " begin"
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr " eind"
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "Nr."
-#: print.c:322
+#: print.c:307
#, c-format
msgid "%.*f %s"
msgstr "%.*f %s"
-#: print.c:267 print.c:340
+#: print.c:252 print.c:325
#, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s\n"
-#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr "%.0f%s %s\n"
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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$02d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:584
+#: print.c:575
#, 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$02d:%6$02d"
@@ -85,32 +85,32 @@ 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:551
+#: statistics.c:549
#, 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$02d:%6$02d"
-#: print.c:609 statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %du %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%du %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr "%s"
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
@@ -119,7 +119,7 @@ msgstr ""
"%s\n"
"CNS:%u%%"
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
@@ -128,7 +128,7 @@ msgstr ""
"%s\n"
"Berekend plafond %.0f %s"
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
@@ -137,7 +137,7 @@ msgstr ""
"%s\n"
"Deco:%umin @ %.0f %s"
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
@@ -146,7 +146,7 @@ msgstr ""
"%s\n"
"Deco:onbek.tijd @ %.0f %s"
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -159,7 +159,7 @@ msgstr ""
"END:%d%s\n"
"EADD:%d%s"
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
@@ -168,7 +168,7 @@ msgstr ""
"%s\n"
"In deco"
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
@@ -177,7 +177,7 @@ msgstr ""
"%s\n"
"MOD:%d%s"
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
@@ -186,7 +186,7 @@ msgstr ""
"%s\n"
"NDL:%umin"
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
@@ -195,7 +195,7 @@ msgstr ""
"%s\n"
"P:%d %s"
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
@@ -204,7 +204,7 @@ msgstr ""
"%s\n"
"Veiligheidsstop:%umin @ %.0f %s"
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
@@ -213,7 +213,19 @@ msgstr ""
"%s\n"
"Veiligheidsstop:onbek.tijd @ %.0f %s"
-#: profile.c:2107
+#: planner.c:468
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+"Subsurface duikplan\n"
+"Gebaseerd op GFlow = %.0f en GFhigh = %.0f\n"
+"\n"
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
@@ -222,7 +234,7 @@ msgstr ""
"%s\n"
"T:%.1f %s"
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
@@ -231,7 +243,7 @@ msgstr ""
"%s\n"
"pHe:%.2fbar"
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
@@ -240,7 +252,7 @@ msgstr ""
"%s\n"
"pN%s:%.2fbar"
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
@@ -249,12 +261,12 @@ msgstr ""
"%s\n"
"pO%s:%.2fbar"
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) of (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, c-format
msgid "(no dives)"
msgstr "(geen duiken)"
@@ -263,66 +275,57 @@ msgstr "(geen duiken)"
msgid "(nothing)"
msgstr "(niets)"
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr "0.6 cuft/min"
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr "0.7 cuft/min"
-#: print.c:907
-msgid "1 dive per page"
-msgstr "1 duik per bladzijde"
-
-#: planner.c:1231
+#: planner.c:1253
msgid "17 l/min"
msgstr "17L/min"
+#: print.c:924
+#, fuzzy
+msgid "2 dives per page"
+msgstr "6 duiken per bladzijde"
+
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr "2-delig pak"
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr "20L/min"
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr "stappen van 3m voor berekend plafond"
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr "6 duiken per bladzijde"
-#: planner.c:1203
+#: planner.c:1197
+#, fuzzy
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given "
-"depth, takes the given time (if relative, e.g. '+3:30') or ends at the given "
-"time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
-"An entry that has a depth and a gas given but no time is special; it informs "
-"the planner that the gas specified is available for the ascent once the "
-"depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
"<small>Voeg etappes hieronder toe.\n"
"Elke invoer beschrijft een deel van de geplande duik.\n"
-"Een invoer met diepte, tijd en gas beschrijft een etappe dat eindigt op de "
-"gegeven diepte, de gegeven tijd duurt (indien relatief, bijv. '+3:30') of "
-"eindigt op de gegeven tijd (indien absoluut) en gebruik maakt van het "
-"opgegeven gasmengsel.\n"
-"Een leeggelaten gasmengsel betekent 'gebruik vorig gasmengsel' (of AIR als "
-"geen gasmengsel opgegeven is).\n"
-"Een invoer die een diepte en een gas heeft, maar geen tijd, is speciaal: het "
-"vertelt de planner dat het opgegeven gasmengsel beschikbaar is voor de "
-"opstijging wanneer de opgegeven diepte is bereikt.\n"
-"CC Instelpunt specificeert CC (rebreather) duiken, dit veld wordt niet "
-"ingevuld voor OC.</small>"
-
-#: planner.c:1113
+"Een invoer met diepte, tijd en gas beschrijft een etappe dat eindigt op de gegeven diepte, de gegeven tijd duurt (indien relatief, bijv. '+3:30') of eindigt op de gegeven tijd (indien absoluut) en gebruik maakt van het opgegeven gasmengsel.\n"
+"Een leeggelaten gasmengsel betekent 'gebruik vorig gasmengsel' (of AIR als geen gasmengsel opgegeven is).\n"
+"Een invoer die een diepte en een gas heeft, maar geen tijd, is speciaal: het vertelt de planner dat het opgegeven gasmengsel beschikbaar is voor de opstijging wanneer de opgegeven diepte is bereikt.\n"
+"CC Instelpunt specificeert CC (rebreather) duiken, dit veld wordt niet ingevuld voor OC.</small>"
+
+#: planner.c:1123
msgid "AIR"
msgstr "AIR"
@@ -334,27 +337,27 @@ msgstr "Over Subsurface"
msgid "Add Dive..."
msgstr "Duik toevoegen..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Duik Toevoegen"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Trip hierboven toevoegen"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr "Voeg routepunt toe."
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr "Luchtdruk"
-#: statistics.c:844
+#: statistics.c:847
msgid "Air Temp"
msgstr "Luchttemp."
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr "Luchttemp. in %s"
@@ -375,64 +378,64 @@ msgstr "aug"
msgid "Autogroup"
msgstr "Automatisch groeperen"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Gemiddelde"
-#: statistics.c:799 statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Gem. diepte"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Gem. gasverbruik"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Gem. temp."
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Gem. tijd"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr "Schakel om naar OC"
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "bar"
-#: info.c:700 info.c:1153 print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Buddy"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr "CC Instelpunt"
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr "Geännuleerd, zonder problemen afgesloten..."
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr "Geännuleerd..."
@@ -440,11 +443,11 @@ msgstr "Geännuleerd..."
msgid "Cannot parse response!"
msgstr "Kan antwoord niet parsen!"
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Kies standaard XML bestand"
@@ -456,7 +459,7 @@ msgstr "Kies de XML bestanden om te importeren in huidig data bestand"
msgid "Close"
msgstr "Sluiten"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Alles inklappen"
@@ -468,19 +471,19 @@ msgstr "Verbinding wordt opgezet."
msgid "Connection Error: "
msgstr "Verbindingsfout:"
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Nieuwe trip hierboven invoegen"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "cuft"
-#: divelist.c:1423 gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Fles"
-#: equipment.c:918 equipment.c:1029 print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Fles"
@@ -488,20 +491,24 @@ msgstr "Fles"
msgid "Cylinders"
msgstr "Flessen"
-#: profile.c:2098
+#: profile.c:2102
#, c-format
msgid "D:%.1f %s"
msgstr "D:%.1f %s"
-#: divelist.c:1416 print.c:510 statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Datum"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Datum en tijd"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Datum:"
@@ -509,7 +516,7 @@ msgstr "Datum:"
msgid "Dec"
msgstr "dec"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Standaard XML bestand"
@@ -517,19 +524,19 @@ msgstr "Standaard XML bestand"
msgid "Delete a dive computer information entry"
msgstr "Verwijder duikcomputerinformatie"
-#: divelist.c:2206 divelist.c:2259 divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Duik verwijderen"
-#: divelist.c:2208 divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Duiken verwijderen"
-#: print.c:510 statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Diepte"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Diepte (%s):"
@@ -538,7 +545,7 @@ msgstr "Diepte (%s):"
msgid "Depth Limit Exceeded"
msgstr "Dieptelimiet overschreden"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Diepte:"
@@ -556,12 +563,12 @@ msgstr "Device of mountpoint"
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Duik nr. %1$d - %2$s %4$02d-%3$02d-%5$04d om %6$02d:%7$02d"
-#: info.c:157 print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Duik nr. %d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Duik nr. %d: %s %d %04d"
@@ -570,7 +577,7 @@ msgstr "Duik nr. %d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Duikcomputer naam"
-#: gtk-gui.c:1607 info.c:898 statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Duikinformatie"
@@ -578,13 +585,11 @@ msgstr "Duikinformatie"
msgid "Dive Notes"
msgstr "Duiknotities"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
-msgstr ""
-"Duikplan - DIT IS ENKEL EEN SIMULATIE; NIET GEBRUIKEN VOOR EEN WERKELIJKE "
-"DUIK"
+msgstr "Duikplan - DIT IS ENKEL EEN SIMULATIE; NIET GEBRUIKEN VOOR EEN WERKELIJKE DUIK"
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Duiktijd"
@@ -600,11 +605,11 @@ msgstr "Info: Duiktijd"
msgid "Dive computer vendor and product"
msgstr "Duikcomputer merk en model"
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Fout bij importeren van duikdata"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Duikdetails"
@@ -612,27 +617,27 @@ msgstr "Duikdetails"
msgid "Dive locations"
msgstr "Duiklocaties"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Duikleider"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr "Wanneer begint de duik?"
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Duik nr."
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Duiklijst font"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Duikleider"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Duiken"
@@ -660,28 +665,28 @@ msgstr "Download van Webservice..."
msgid "Download Success!"
msgstr "Laden succesvol voltooid!"
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Duur"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Duur (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr "O"
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr "EAN%d"
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr "EAN32"
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr "EAN36"
@@ -697,43 +702,39 @@ msgstr "Apparaatnamen bewerken"
msgid "Edit Dive Computer Nicknames"
msgstr "Bewerk duikcomputer apparaatnamen"
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Trip informatie bewerken"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Trip overzicht bewerken"
#: gtk-gui.c:1302
-msgid ""
-"Edit a dive computer nickname by double-clicking the in the relevant "
-"nickname field"
-msgstr ""
-"Bewerk een duikcomputernaam door te dubbelklikken in het relevante "
-"apparaatnaamveld."
+msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
+msgstr "Bewerk een duikcomputernaam door te dubbelklikken in het relevante apparaatnaamveld."
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Duik bewerken"
-#: divelist.c:2405 divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
msgid "Edit dive date/time"
msgstr "Datum/tijd van duik bewerken"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Duiken bewerken"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Bewerk meerdere duiken"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Trip overzicht bewerken"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "In-/uitschakelen gebeurtenissen"
@@ -741,81 +742,76 @@ msgstr "In-/uitschakelen gebeurtenissen"
msgid "End"
msgstr "Einde"
-#: planner.c:1139
+#: planner.c:1149
msgid "Ending Depth"
msgstr "Einddiepte"
#: webservice.c:220
-msgid ""
-"Enter a user identifier and press 'Download'. Once the download is complete "
-"you can press 'Apply' if you wish to apply the changes."
-msgstr ""
-"Voer een gebruikers-ID in en klik op \"Download\". Wanneer de download "
-"voltooid is kunt u op \"Toepassen\" klikken als u de veranderingen wilt "
-"uitvoeren."
+msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
+msgstr "Voer een gebruikers-ID in en klik op \"Download\". Wanneer de download voltooid is kunt u op \"Toepassen\" klikken als u de veranderingen wilt uitvoeren."
-#: gtk-gui.c:1603 info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Uitrusting"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr "Fout bij het verkrijgen van het zoutgehalte"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Fout bij verwerken van de datum en tijd"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Fout bij verwerken van de duikduur"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Fout bij het verwerken van het gasmengsel"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Fout bij het verwerken van het aantal gasmengsels"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Fout bij het verwerken van de maximum duikdiepte"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Fout bij het verwerken van de samples"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Fout bij het registreren van de cancellation handler."
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Fout bij het registreren van de data"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Fout bij het registreren van de event handler."
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Event: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Event: wachten op handeling van gebruiker"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Alles uitklappen"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Fout bij openen van %i bestanden."
@@ -830,12 +826,12 @@ msgstr "Fout bij analyse van '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Fout bij analyseren van '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Fout bij lezen van '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Fout bij lezen van '%s'.\n"
@@ -844,7 +840,7 @@ msgstr "Fout bij lezen van '%s'.\n"
msgid "Feb"
msgstr "feb"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "voet"
@@ -864,46 +860,46 @@ msgstr "Forceer download van alle duiken"
msgid "Fri"
msgstr "Vr"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr "GFhigh"
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr "GFhigh voor plan"
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr "GFlow"
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr "GFlow voor plan"
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (WGS84 of GPS-formaat)"
-#: statistics.c:854
+#: statistics.c:857
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gas verbruikt"
-#: planner.c:1141
+#: planner.c:1151
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gas gebruikt"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr "Gasverbruik:\n"
-#: equipment.c:959 print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Gasmengsel"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr "Algemene Instellingen"
@@ -923,7 +919,7 @@ msgstr "Importeer XML bestand(en)..."
msgid "Info"
msgstr "Informatie"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr "Initialiseer communicatie"
@@ -956,11 +952,11 @@ msgstr "Linus Torvalds, Dirk Hohndel en anderen, 2011, 2012, 2013"
msgid "List"
msgstr "Lijst"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "liter"
-#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Locatie"
@@ -968,12 +964,12 @@ msgstr "Locatie"
msgid "Log"
msgstr "Log"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Langste"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Langste duik"
@@ -997,7 +993,7 @@ msgstr "Markeer locatie hier"
msgid "Marker"
msgstr "Markering"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Master"
@@ -1005,19 +1001,19 @@ msgstr "Master"
msgid "Max Deco Time Warning"
msgstr "Waarschuwing: Maximale deco-tijd"
-#: statistics.c:797 statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Max. diepte"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Max. gasverbruik"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Max. temp."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -1028,7 +1024,7 @@ msgstr ""
"Duur: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr "Max. CNS"
@@ -1037,17 +1033,17 @@ msgstr "Max. CNS"
msgid "MaxPress"
msgstr "Max. druk"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Grootste"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Grootste"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Grootste"
@@ -1056,50 +1052,50 @@ msgstr "Grootste"
msgid "May"
msgstr "mei"
-#: divelist.c:2339
+#: divelist.c:2368
msgid "Merge dives"
msgstr "Duiken samenvoegen"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Trip met bovenstaande samenvoegen"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Trip met onderstaande samenvoegen"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "meter"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Min. diepte"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Min. gasverbruik"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Min. temp."
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Kleinste"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Kleinste"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Kleinste"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Diverse opties"
@@ -1115,7 +1111,7 @@ msgstr "Ma"
msgid "Multi-platform divelog software in C"
msgstr "Multi-platform Duikprogramma in C"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr "N"
@@ -1123,7 +1119,7 @@ msgstr "N"
msgid "New"
msgstr "Nieuw"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Nieuw beginnummer"
@@ -1139,7 +1135,7 @@ msgstr "Apparaatnaam"
msgid "No Tank Data"
msgstr "Geen flesinformatie"
-#: info.c:611 info.c:725 info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Notities"
@@ -1151,7 +1147,7 @@ msgstr "nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1160,7 +1156,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "okt"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Onbekende pthread foutmelding"
@@ -1168,7 +1164,7 @@ msgstr "Onbekende pthread foutmelding"
msgid "Ok to delete the selected entry?"
msgstr "Geselecteerde gegevens wissen?"
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Bestand openen"
@@ -1176,7 +1172,7 @@ msgstr "Bestand openen"
msgid "Open..."
msgstr "Openen..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr "Zuurstof"
@@ -1197,11 +1193,11 @@ msgstr "Waarschuwing: Opstijging / PO2"
msgid "PO2 Green Warning"
msgstr "Waarschuwing: PO2 Groen"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "psi"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr "Kies op kaart"
@@ -1209,7 +1205,7 @@ msgstr "Kies op kaart"
msgid "Planner"
msgstr "Planner"
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Instellingen"
@@ -1221,7 +1217,7 @@ msgstr "Instellingen..."
msgid "Pressure"
msgstr "Druk"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Druk:"
@@ -1229,15 +1225,15 @@ msgstr "Druk:"
msgid "Prev DC"
msgstr "Vorige DC"
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Alleen geselecteerde duiken afdrukken"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Selectie afdrukken"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Afdruktype"
@@ -1249,7 +1245,7 @@ msgstr "Afdrukken..."
msgid "Profile"
msgstr "Profiel"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
msgid "Profile Settings"
msgstr "Profiel"
@@ -1265,7 +1261,7 @@ msgstr "Alarm: resterende gas-tijd"
msgid "RGT Warning"
msgstr "Waarschuwing: resterende gas-tijd"
-#: info.c:705 info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Waardering"
@@ -1274,19 +1270,19 @@ msgstr "Waardering"
msgid "Reading %s %s"
msgstr "Lezen %s %s"
-#: divelist.c:2051 divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Trip verwijderen"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Duik uit trip verwijderen"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Geselecteerde duiken uit trip verwijderen"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Hernummeren"
@@ -1298,20 +1294,20 @@ msgstr "Hernummeren..."
msgid "Retry"
msgstr "Opnieuw"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr "Z"
-#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "Gasverbruik"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr "Gasverbruik tijdens decostop"
-#: planner.c:1235
+#: planner.c:1257
msgid "SAC during dive"
msgstr "Gasverbruik tijdens duik"
@@ -1331,23 +1327,28 @@ msgstr "Za"
msgid "Save As..."
msgstr "Opslaan als..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Aanpassingen opslaan?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Bestand opslaan als"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Opslaan als..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Opslaan..."
-#: planner.c:1140
+#: planner.c:1150
msgid "Segment Time"
msgstr "Segment duur"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
msgid "Select Events"
msgstr "gebeurtenissen selecteren"
@@ -1367,54 +1368,54 @@ msgstr ""
"Gedeeltelijke schrijfvoortgang naar req.txt bestand\n"
"Is de Uemis Zurich correkt aangesloten?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Kortste"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Kortste duik"
-#: gtk-gui.c:653 gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Kolommen afbeelden"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr "Toon EAD, END en EADD"
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr "Toon MOD"
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr "Toon berekend plafond"
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr "Toon door duikcomputer aangegeven plafond in rood"
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr "Toon op kaart"
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr "Toon pHe-grafiek"
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr "Toon pN%s-grafiek"
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr "Toon pO%s-grafiek"
-#: planner.c:191
+#: planner.c:192
msgid "Simulated Dive"
msgstr "Gesimuleerde duik"
@@ -1434,15 +1435,15 @@ msgstr "Waarschuwing: snelheid"
msgid "Start"
msgstr "Start"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr "Begin download"
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Statistieken"
-#: statistics.c:705
+#: statistics.c:708
#, c-format
msgid "Statistics %s"
msgstr "Statistieken %s"
@@ -1455,23 +1456,12 @@ msgstr "Statistieken"
msgid "Status"
msgstr "Status"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s\n"
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-"Subsurface duikplan\n"
-"Gebaseerd op GFlow = %.0f en GFhigh = %.0f\n"
-"\n"
-
-#: divelist.c:1422 gtk-gui.c:684 info.c:706 info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Pak"
@@ -1480,20 +1470,20 @@ msgstr "Pak"
msgid "Sun"
msgstr "Zo"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Oppervlaktetijd"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr "Luchtdruk (mbar)"
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr "Gaswissel naar %s\n"
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Afdrukken in tabelvorm"
@@ -1505,19 +1495,19 @@ msgstr "Fleswissel voorgesteld"
msgid "Tank Pressure Info"
msgstr "Info: Flesdruk"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr "Tec instellingen"
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temperatuur"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Temperatuur"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Temperatuur:"
@@ -1529,7 +1519,7 @@ msgstr "Drie"
msgid "Thu"
msgstr "Do"
-#: info.c:1016 print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Tijd"
@@ -1545,21 +1535,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Zoom in-/uitschakelen"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Totale"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Totale tijd"
-#: print.c:336
+#: print.c:321
#, c-format
msgid "Total Weight:"
msgstr "Totaal gewicht:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %s\n"
@@ -1600,25 +1590,25 @@ msgstr ""
"AUB de duikcomputer loskoppellen en weer aansluiten\n"
"en probeer opnieuw"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Uemis niet geïnitialiseerd"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Kan geen context creëren voor libdivecomputer"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Kan geen parser creëren voor %s %s"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Fout bij openen van %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Eenheden"
@@ -1630,19 +1620,19 @@ msgstr "Gebruikersidentificatie"
msgid "View"
msgstr "Weergave"
-#: info.c:711 statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr "Zicht"
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Volume:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr "W"
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Watertemp."
@@ -1654,28 +1644,28 @@ msgstr "Webservice"
msgid "Wed"
msgstr "Wo"
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Gewicht"
-#: equipment.c:1084 print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Gewichtssysteem"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Gewicht:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML bestand"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Jaar"
-#: gtk-gui.c:1371 statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Jaarlijkse statistieken"
@@ -1684,22 +1674,14 @@ msgstr "Jaarlijkse statistieken"
msgid ""
"You already have a dive computer of this model\n"
"named %s\n"
-"Subsurface can maintain a nickname for this device to distinguish it from "
-"the existing one. The default is the model and device ID as shown below.\n"
-"If you don't want to name this dive computer click 'Cancel' and Subsurface "
-"will simply display its model as its name (which may mean that you cannot "
-"tell the two dive computers apart in the logs)."
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
msgstr ""
"U heeft al een duikcomputer van dit model met naam %s\n"
-"Subsurface kan een bijnaam voor dit apparaat gebruiken zodat het "
-"onderscheiden kan worden van de reeds bestaande. De standaardnaam is het "
-"model en het apparaat ID zoals hieronder getoond.\n"
-"Als u geen bijnaam voor deze duikcomputer wilt gebruiken, klik dan op "
-"\"Annuleren\" en Subsurface zal dan het model als de naam gebruiken (wat kan "
-"betekenen dat u de twee duikcomputers niet van elkaar kunt onderscheiden in "
-"het logboek)."
-
-#: gtk-gui.c:208
+"Subsurface kan een bijnaam voor dit apparaat gebruiken zodat het onderscheiden kan worden van de reeds bestaande. De standaardnaam is het model en het apparaat ID zoals hieronder getoond.\n"
+"Als u geen bijnaam voor deze duikcomputer wilt gebruiken, klik dan op \"Annuleren\" en Subsurface zal dan het model als de naam gebruiken (wat kan betekenen dat u de twee duikcomputers niet van elkaar kunt onderscheiden in het logboek)."
+
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1707,7 +1689,7 @@ msgstr ""
"U heeft onopgeslagen wijzigingen.\n"
"Wilt u deze opslaan voordat u het databestand afsluit?"
-#: gtk-gui.c:211 gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1716,7 +1698,8 @@ msgstr ""
"U heeft onopgeslagen wijzigingen in bestand: %s \n"
"Wilt u deze opslaan voordat u het databestand afsluit?"
-#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
+#: profile.c:399
#, c-format
msgid "air"
msgstr "lucht"
@@ -1761,7 +1744,7 @@ msgstr "plafond (veiligheidsstop)"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91 planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "cuft"
@@ -1793,36 +1776,36 @@ msgstr "duiktijd"
msgid "drysuit"
msgstr "droogpak"
-#: planner.c:727
+#: planner.c:734
msgid "ean"
msgstr "EAN"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr "voor alle duiken"
-#: statistics.c:674
+#: statistics.c:677
#, c-format
msgid "for dive #%d"
msgstr "Voor duik nr. %d"
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr "voor duik nr."
-#: statistics.c:676
+#: statistics.c:679
#, c-format
msgid "for selected dive"
msgstr "voor de geselecteerde duik"
-#: statistics.c:640
+#: statistics.c:643
#, c-format
msgid "for selected dives"
msgstr "voor de geselecteerde duiken"
-#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1850,7 +1833,7 @@ msgstr "ongeldig event-nummer"
msgid "jacket"
msgstr "jack"
-#: dive.c:141 equipment.c:1004 gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1858,7 +1841,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "US pond"
@@ -1866,15 +1849,15 @@ msgstr "US pond"
msgid "long john"
msgstr "long john"
-#: dive.c:112 info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr "max. pp02"
-#: divelist.c:1427 gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr "max. CNS"
@@ -1886,11 +1869,11 @@ msgstr "Max. diepte"
msgid "membrane"
msgstr "membraan droogpak"
-#: divelist.c:1419 planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)"
@@ -1899,7 +1882,7 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)"
msgid "more data dive id"
msgstr "meer data voor duik ID"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "meer dan %d dagen"
@@ -1912,16 +1895,16 @@ msgstr "nultijd"
msgid "none"
msgstr "geen"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr "pHe grenswaarde"
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr "pN%s grenswaarde"
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr "pO%s grenswaarde"
@@ -1985,8 +1968,7 @@ msgstr "zender"
msgid "unkn"
msgstr "onbek"
-#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "onbekend"
@@ -2014,6 +1996,9 @@ msgstr "natpak"
msgid "workload"
msgstr "werklast"
+#~ msgid "1 dive per page"
+#~ msgstr "1 duik per bladzijde"
+
#~ msgid "Automatically group dives in trips"
#~ msgstr "Automatisch de duiken in trips groeperen"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 1d427d072..99edada66 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2013-02-04 21:49+0200\n"
"Last-Translator: Sergey Starosek <sergey.starosek@gmail.com>\n"
"Language-Team: Russian\n"
@@ -12,7 +12,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr "> Месяц"
@@ -25,46 +25,42 @@ msgstr "Загрузить"
msgid " Please select dive computer and device. "
msgstr "Выберите модель компьютера и устройство."
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr " начало"
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr " конец"
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "№"
-#: print.c:322
+#: print.c:307
#, c-format
msgid "%.*f %s"
msgstr "%.*f %s"
-#: print.c:267
-#: print.c:340
+#: print.c:252 print.c:325
#, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s\n"
-#: statistics.c:588
-#: statistics.c:735
-#: statistics.c:737
-#: statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/мин"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr "%.0f%s %s\n"
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, c-format
msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr ""
@@ -72,7 +68,7 @@ msgstr ""
"%2$s, %4$d %3$s, %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:584
+#: print.c:575
#, 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$d:%6$02d"
@@ -84,33 +80,32 @@ 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:551
+#: statistics.c:549
#, 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:609
-#: statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d мин"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dд %dч %dмин"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dч %dмин"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr "%s"
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
@@ -119,7 +114,7 @@ msgstr ""
"%s\n"
"CNS:%u%%"
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
@@ -128,7 +123,7 @@ msgstr ""
"%s\n"
"Расчетный потолок %.0f %s"
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
@@ -137,7 +132,7 @@ msgstr ""
"%s\n"
"Деко:%uмин @ %.0f %s"
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
@@ -146,7 +141,7 @@ msgstr ""
"%s\n"
"Деко:неизв. время @ %.0f %s"
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -159,7 +154,7 @@ msgstr ""
"END:%d%s\n"
"EADD:%d%s"
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
@@ -168,7 +163,7 @@ msgstr ""
"%s\n"
"В деко"
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
@@ -177,7 +172,7 @@ msgstr ""
"%s\n"
"MOD:%d%s"
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
@@ -186,7 +181,7 @@ msgstr ""
"%s\n"
"NDL:%uмин"
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
@@ -195,7 +190,7 @@ msgstr ""
"%s\n"
"P:%d %s"
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
@@ -204,7 +199,7 @@ msgstr ""
"%s\n"
"Ост.безоп:%uмин @ %.0f %s"
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
@@ -213,7 +208,19 @@ msgstr ""
"%s\n"
"Ост.безоп:неизв. время @ %.0f %s"
-#: profile.c:2107
+#: planner.c:468
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+"План погружения Subsurface\n"
+"на основе значений нижний ГФ = %.0f и верхний ГФ = %.0f\n"
+"\n"
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
@@ -222,7 +229,7 @@ msgstr ""
"%s\n"
"T:%.1f %s"
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
@@ -231,7 +238,7 @@ msgstr ""
"%s\n"
"pHe:%.2fбар"
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
@@ -240,7 +247,7 @@ msgstr ""
"%s\n"
"pN%s:%.2fбар"
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
@@ -249,12 +256,12 @@ msgstr ""
"%s\n"
"pO%s:%.2fбар"
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) или (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, c-format
msgid "(no dives)"
msgstr "(нет погружений)"
@@ -263,46 +270,48 @@ msgstr "(нет погружений)"
msgid "(nothing)"
msgstr "(отсутствует)"
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr "0.6 куб.фут/мин"
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr "0.7 куб.фут/мин"
-#: print.c:907
-msgid "1 dive per page"
-msgstr "1 погр. на стр."
-
-#: planner.c:1231
+#: planner.c:1253
msgid "17 l/min"
msgstr "17 л/мин"
+#: print.c:924
+#, fuzzy
+msgid "2 dives per page"
+msgstr "6 погр. на стр."
+
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr "полный из 2-х"
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr "20 л/мин"
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr "3м шаг для расчетного потолка"
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr "6 погр. на стр."
-#: planner.c:1203
+#: planner.c:1197
+#, fuzzy
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
"<small>Добавляйте сегменты ниже.\n"
"Каждая строка - это часть планируемого погружения.\n"
@@ -311,12 +320,11 @@ msgstr ""
"Строка с указанными глубиной и смесью, но без времени, - особая; она сообщает планировщику, что данная смесь доступна при подъеме по достижении указанной глубины.\n"
"Точка СС помечает погружения с ИДА замкнутого цикла (ребризер), оставьте пустым для обычных погружений.</small>"
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr "воздух"
-#: gtk-gui.c:1054
-#: gtk-gui.c:1377
+#: gtk-gui.c:1054 gtk-gui.c:1377
msgid "About Subsurface"
msgstr "О Subsurface"
@@ -324,27 +332,27 @@ msgstr "О Subsurface"
msgid "Add Dive..."
msgstr "Добавить погружение..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Добавить погружение"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Добавить к поездке выше"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr "Добавить путевую точку"
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr "Давл. возд."
-#: statistics.c:844
+#: statistics.c:847
msgid "Air Temp"
msgstr "Темп. возд."
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr "Темп. воздуха в %s"
@@ -365,67 +373,64 @@ msgstr "Авг"
msgid "Autogroup"
msgstr "Автогруппировка"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Средняя"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Средняя"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Среднее"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Средняя"
-#: statistics.c:799
-#: statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Ср. глуб."
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Сред. SAC"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Ср. темп."
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Ср. время"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr "Переход на Откр. Цикл"
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "Бар"
-#: info.c:700
-#: info.c:1153
-#: print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Партнер"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr "Точка СС"
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr "Отменено, выход..."
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr "Отменено..."
@@ -433,11 +438,11 @@ msgstr "Отменено..."
msgid "Cannot parse response!"
msgstr "Невозможно разобрать ответ!"
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Цельсий"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Выберите XML файл по умолчанию"
@@ -449,7 +454,7 @@ msgstr "Выберите XML файлы для импорта в текущий
msgid "Close"
msgstr "Закрыть"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Свернуть все"
@@ -461,22 +466,19 @@ msgstr "Соединение..."
msgid "Connection Error: "
msgstr "Ошибка соединения:"
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Создать поездку выше"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "куб. фут"
-#: divelist.c:1423
-#: gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Балон"
-#: equipment.c:918
-#: equipment.c:1029
-#: print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Балон"
@@ -484,22 +486,24 @@ msgstr "Балон"
msgid "Cylinders"
msgstr "Балоны"
-#: profile.c:2098
+#: profile.c:2102
#, c-format
msgid "D:%.1f %s"
msgstr "Г:%.1f %s"
-#: divelist.c:1416
-#: print.c:510
-#: statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Дата"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Дата и время"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Дата:"
@@ -507,7 +511,7 @@ msgstr "Дата:"
msgid "Dec"
msgstr "Дек"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "XML файл по умолчанию"
@@ -515,23 +519,19 @@ msgstr "XML файл по умолчанию"
msgid "Delete a dive computer information entry"
msgstr "Удалить дайвкомпьютер"
-#: divelist.c:2206
-#: divelist.c:2259
-#: divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Удалить погружение"
-#: divelist.c:2208
-#: divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Удалить погружения"
-#: print.c:510
-#: statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Глуб."
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Глубина (%s):"
@@ -540,7 +540,7 @@ msgstr "Глубина (%s):"
msgid "Depth Limit Exceeded"
msgstr "Превышен лимит глубины"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Глубина:"
@@ -558,13 +558,12 @@ msgstr "Устройство или точка монтирования"
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Погружение №%1$d - %2$s %4$02d.%3$02d.%5$04d в %6$d:%7$02d"
-#: info.c:157
-#: print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Погр. №%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Погружение %d: %s %d %04d"
@@ -573,9 +572,7 @@ msgstr "Погружение %d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Название дайвкомпьютера"
-#: gtk-gui.c:1607
-#: info.c:898
-#: statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Информация"
@@ -583,11 +580,11 @@ msgstr "Информация"
msgid "Dive Notes"
msgstr "Погружение"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr "План погружения - ЭТО ТОЛЬКО ИМИТАЦИЯ; НЕ ИСПОЛЬЗУЙТЕ ДЛЯ ПОГРУЖЕНИЯ"
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Время погр."
@@ -603,11 +600,11 @@ msgstr "Информация о времени погружения"
msgid "Dive computer vendor and product"
msgstr "Производитель и модель"
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Ошибка импорта данных погружения"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Детали погружения"
@@ -615,27 +612,27 @@ msgstr "Детали погружения"
msgid "Dive locations"
msgstr "Места погружений"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Инструктор"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr "Начало погружения"
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Погр#"
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Шрифт списка"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Инструктор"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Погружения"
@@ -663,28 +660,28 @@ msgstr "Загрузка из вебсервиса..."
msgid "Download Success!"
msgstr "Успешная загрузка!"
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Длительность"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Длительность (мин)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr "В"
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr "EAN%d"
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr "EAN32"
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr "EAN36"
@@ -700,11 +697,11 @@ msgstr "Список дайвкомпьютеров"
msgid "Edit Dive Computer Nicknames"
msgstr "Редактирование названий дайвкомпьютеров"
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Редактирование поездки"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Краткие данные о поездке"
@@ -712,37 +709,35 @@ msgstr "Краткие данные о поездке"
msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr "Чтобы редактировать название компьютера, дважды щелкните мышью в поле названия"
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Редактировать погружение"
-#: divelist.c:2405
-#: divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
msgid "Edit dive date/time"
msgstr "Редактировать дату/время"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Редактировать погружения"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Множественное редактирование"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Редактировать данные поездки"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Разрешить / Запретить события"
-#: equipment.c:949
-#: equipment.c:1456
+#: equipment.c:949 equipment.c:1456
msgid "End"
msgstr "Конец"
-#: planner.c:1139
+#: planner.c:1149
msgid "Ending Depth"
msgstr "Конечная глубина"
@@ -750,69 +745,68 @@ msgstr "Конечная глубина"
msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr "Введите идентификатор пользователя и нажмите 'Загрузить'. По окончании загрузки вы можете нажать 'Применить' чтобы внести изменения."
-#: gtk-gui.c:1603
-#: info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Снаряжение"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr "Ошибка получения солености воды"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Ошибка разбора даты/времени"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Ошибка разбора времени погружения"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Ошибка разбора смеси"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Ошибка разбора счетчика смесей"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Ошибка разбора макс. глубины"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Ошибка разбора выборки"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Ошибка регистрации обработчика завершения."
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Ошибка регистрации данных"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Ошибка регистрации обработчика событий."
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Событие: сис.время=%<PRId64>, уст.время=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Событие: ожидание действия пользователя"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Развернуть все"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Фаренгейт"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Не получилось открыть %i файлов."
@@ -827,12 +821,12 @@ msgstr "Ошибка разбора '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Ошибка разбора '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Ошибка чтения '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Ошибка чтения '%s'.\n"
@@ -841,7 +835,7 @@ msgstr "Ошибка чтения '%s'.\n"
msgid "Feb"
msgstr "Фев"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "Фут"
@@ -861,47 +855,46 @@ msgstr "Принудительная загрузка всех погружен
msgid "Fri"
msgstr "Птн"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr "верхний ГФ"
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr "верхний ГФ для плана"
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr "нижний ГФ"
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr "нижний ГФ для плана"
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (формат WGS84 или GPS)"
-#: statistics.c:854
+#: statistics.c:857
msgctxt "Amount"
msgid "Gas Used"
msgstr "Расход"
-#: planner.c:1141
+#: planner.c:1151
msgctxt "Type of"
msgid "Gas Used"
msgstr "Смесь"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr "Потребление смеси:\n"
-#: equipment.c:959
-#: print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Смесь"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr "Общие настройки"
@@ -921,7 +914,7 @@ msgstr "Импорт XML файла(-ов)..."
msgid "Info"
msgstr "Информация"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr "Инициализация связи"
@@ -954,15 +947,11 @@ msgstr "Линус Торвальдс, Дирк Хондел и другие, 20
msgid "List"
msgstr "Список"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "Литр"
-#: divelist.c:1428
-#: info.c:606
-#: info.c:676
-#: info.c:1147
-#: print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Местонахождение"
@@ -970,12 +959,12 @@ msgstr "Местонахождение"
msgid "Log"
msgstr "Журнал"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Максимум"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Самый долгий"
@@ -999,7 +988,7 @@ msgstr "Пометить точку здесь"
msgid "Marker"
msgstr "Метка"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Инструктор"
@@ -1007,20 +996,19 @@ msgstr "Инструктор"
msgid "Max Deco Time Warning"
msgstr "Предупреждение макс. времени декомпрессии"
-#: statistics.c:797
-#: statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Макс. глуб."
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Макс. SAC"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Макс. темп."
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -1031,7 +1019,7 @@ msgstr ""
"Длительность: %d мин\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr "Макс. CNS"
@@ -1040,17 +1028,17 @@ msgstr "Макс. CNS"
msgid "MaxPress"
msgstr "Макс. давл."
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Максимум"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Максимум"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Максимум"
@@ -1059,50 +1047,50 @@ msgstr "Максимум"
msgid "May"
msgstr "Май"
-#: divelist.c:2339
+#: divelist.c:2368
msgid "Merge dives"
msgstr "Объединить погружения"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Объединить с поездкой выше"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Объединить с поездкой ниже"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "Метр"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Мин. глуб."
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Мин. SAC"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Мин. темп."
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Минимум"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Минимум"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Минимум"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Прочие настройки"
@@ -1118,7 +1106,7 @@ msgstr "Пнд"
msgid "Multi-platform divelog software in C"
msgstr "Кроссплатформенный журнал погружений"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr "С"
@@ -1126,7 +1114,7 @@ msgstr "С"
msgid "New"
msgstr "Новый"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Начать нумерацию с"
@@ -1134,8 +1122,7 @@ msgstr "Начать нумерацию с"
msgid "Next DC"
msgstr "След. ДК"
-#: gtk-gui.c:1274
-#: gtk-gui.c:1999
+#: gtk-gui.c:1274 gtk-gui.c:1999
msgid "Nickname"
msgstr "Имя устройства"
@@ -1143,9 +1130,7 @@ msgstr "Имя устройства"
msgid "No Tank Data"
msgstr "Нет данных о балоне"
-#: info.c:611
-#: info.c:725
-#: info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Примечания"
@@ -1157,10 +1142,7 @@ msgstr "Ноя"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426
-#: gtk-gui.c:722
-#: print.c:363
-#: statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1169,7 +1151,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "Окт"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Необычная ошибка возврата pthread"
@@ -1177,7 +1159,7 @@ msgstr "Необычная ошибка возврата pthread"
msgid "Ok to delete the selected entry?"
msgstr "Удалить выбранную запись?"
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Открыть файл"
@@ -1185,7 +1167,7 @@ msgstr "Открыть файл"
msgid "Open..."
msgstr "Открыть..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr "Кислород"
@@ -1206,11 +1188,11 @@ msgstr "Предупреждение PO2 при подъеме"
msgid "PO2 Green Warning"
msgstr "Предупреждение PO2 (зеленый)"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "PSI"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr "Выбрать на карте"
@@ -1218,7 +1200,7 @@ msgstr "Выбрать на карте"
msgid "Planner"
msgstr "Планировщик"
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Предпочтения"
@@ -1226,12 +1208,11 @@ msgstr "Предпочтения"
msgid "Preferences..."
msgstr "Предпочтения..."
-#: equipment.c:938
-#: equipment.c:944
+#: equipment.c:938 equipment.c:944
msgid "Pressure"
msgstr "Давление"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Давление:"
@@ -1239,15 +1220,15 @@ msgstr "Давление:"
msgid "Prev DC"
msgstr "Пред. ДК"
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Печать выбранных погружений"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Печать выделенных"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Тип печати"
@@ -1259,7 +1240,7 @@ msgstr "Печать..."
msgid "Profile"
msgstr "Профиль"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
msgid "Profile Settings"
msgstr "Настройки профиля"
@@ -1275,8 +1256,7 @@ msgstr "Сигнал RGT"
msgid "RGT Warning"
msgstr "Предупреждение RGT"
-#: info.c:705
-#: info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Оценка"
@@ -1285,20 +1265,19 @@ msgstr "Оценка"
msgid "Reading %s %s"
msgstr "Чтение %s %s"
-#: divelist.c:2051
-#: divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Удалить поездку"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Удалить из поездки"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Удалить выделенные из поездки"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Перенумеровать"
@@ -1310,24 +1289,20 @@ msgstr "Перенумеровать..."
msgid "Retry"
msgstr "Повторить"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr "Ю"
-#: divelist.c:1425
-#: gtk-gui.c:674
-#: print.c:410
-#: statistics.c:182
-#: statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "SAC"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr "SAC при декостоп"
-#: planner.c:1235
+#: planner.c:1257
msgid "SAC during dive"
msgstr "SAC при погружении"
@@ -1347,23 +1322,28 @@ msgstr "Суб"
msgid "Save As..."
msgstr "Сохранить как..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Сохранить изменения?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Сохранить файл как"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Сохранить как..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Сохранить..."
-#: planner.c:1140
+#: planner.c:1150
msgid "Segment Time"
msgstr "Время сегмента"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
msgid "Select Events"
msgstr "Выбрать события"
@@ -1383,60 +1363,58 @@ msgstr ""
"Прервана запись в файл req.txt\n"
"Проверьте подключение Uemis Zurich."
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Минимум"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Самый короткий"
-#: gtk-gui.c:653
-#: gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Показать колонки"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr "Показать EAD, END, EADD"
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr "Показать MOD"
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr "Показать расчетный потолок"
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr "Показать потолок компьютера красным"
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr "Показать на карте"
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr "График pHe"
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr "График pN%s"
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr "График pO%s"
-#: planner.c:191
+#: planner.c:192
msgid "Simulated Dive"
msgstr "Моделирование погружения"
-#: equipment.c:935
-#: equipment.c:1453
+#: equipment.c:935 equipment.c:1453
msgid "Size"
msgstr "Объем"
@@ -1448,20 +1426,19 @@ msgstr "Сигнал скорости"
msgid "Speed Warning"
msgstr "Предупреждение скорости"
-#: equipment.c:946
-#: equipment.c:1455
+#: equipment.c:946 equipment.c:1455
msgid "Start"
msgstr "Начало"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr "Начать загрузку"
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Статистика"
-#: statistics.c:705
+#: statistics.c:708
#, c-format
msgid "Statistics %s"
msgstr "Статистика %s"
@@ -1474,26 +1451,12 @@ msgstr "Статистика"
msgid "Status"
msgstr "Состояние"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s\n"
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-"План погружения Subsurface\n"
-"на основе значений нижний ГФ = %.0f и верхний ГФ = %.0f\n"
-"\n"
-
-#: divelist.c:1422
-#: gtk-gui.c:684
-#: info.c:706
-#: info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Костюм"
@@ -1502,20 +1465,20 @@ msgstr "Костюм"
msgid "Sun"
msgstr "Вск"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Пов. инт."
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr "Давление на поверхности (мбар)"
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr "Замена смеси на %s\n"
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Таблица"
@@ -1527,19 +1490,19 @@ msgstr "Рекомендуется смена балона"
msgid "Tank Pressure Info"
msgstr "Информация о давлении в балоне"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr "Техн. настройки"
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Темп."
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Температура"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Температура:"
@@ -1551,8 +1514,7 @@ msgstr "Три панели"
msgid "Thu"
msgstr "Чтв"
-#: info.c:1016
-#: print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Время"
@@ -1568,21 +1530,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Изменить масштаб"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Общая"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Общее время"
-#: print.c:336
+#: print.c:321
#, c-format
msgid "Total Weight:"
msgstr "Общий вес:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s\n"
@@ -1600,8 +1562,7 @@ msgstr[2] "Trip %1$s, %3$d %2$s %4$d (%5$d погружений)"
msgid "Tue"
msgstr "Втр"
-#: equipment.c:1452
-#: equipment.c:1480
+#: equipment.c:1452 equipment.c:1480
msgid "Type"
msgstr "Тип"
@@ -1625,25 +1586,25 @@ msgstr ""
"Отсоедините и подключите дайв-компьютер\n"
"и попробуйте заново"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Ошибка инициализации Uemis"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Невозможно создать контекст libdivecomputer"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Невозможно создать анализатор для %s %s"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Невозможно открыть %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Единицы"
@@ -1655,20 +1616,19 @@ msgstr "Идентификатор пользователя"
msgid "View"
msgstr "Просмотр"
-#: info.c:711
-#: statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr "Видимость"
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Объем:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr "З"
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Темп. воды"
@@ -1680,32 +1640,28 @@ msgstr "Вебсервис"
msgid "Wed"
msgstr "Срд"
-#: equipment.c:985
-#: equipment.c:1579
-#: gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Груз"
-#: equipment.c:1084
-#: print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Грузовая система"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Вес:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML файл"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Год"
-#: gtk-gui.c:1371
-#: statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Статистика за год"
@@ -1721,7 +1677,7 @@ msgstr ""
"который называется %s.Subsurface позволяет именовать компьютеры чтобы различать их. По умолчанию это модель и идентификатор, указанные ниже.\n"
"Если вы не хотите именовать этот компьютер, нажмите 'Отмена' и Subsurface будет показывать его модель вместо имени (и вы не сможете отличить их друг от друга в журналах)."
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1729,8 +1685,7 @@ msgstr ""
"У вас есть несохраненные изменения.\n"
"Хотите ли вы их сохранить перед закрытием журнала?"
-#: gtk-gui.c:211
-#: gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1739,10 +1694,7 @@ msgstr ""
"У вас есть несохраненные изменения в файле %s.\n"
"Хотите ли вы их сохранить перед закрытием журнала?"
-#: divelist.c:544
-#: planner.c:74
-#: planner.c:725
-#: print.c:183
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
#: profile.c:399
#, c-format
msgid "air"
@@ -1788,8 +1740,7 @@ msgstr "потолок (остановка безопасности)"
msgid "clip-on"
msgstr "карабины"
-#: dive.c:91
-#: planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "куб. фут"
@@ -1821,39 +1772,36 @@ msgstr "время погружения"
msgid "drysuit"
msgstr "сухой"
-#: planner.c:727
+#: planner.c:734
msgid "ean"
msgstr "ean"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr "для всех погружений"
-#: statistics.c:674
+#: statistics.c:677
#, c-format
msgid "for dive #%d"
msgstr "для погружения №%d"
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr "для погружений №"
-#: statistics.c:676
+#: statistics.c:679
#, c-format
msgid "for selected dive"
msgstr "для выбранного погружения"
-#: statistics.c:640
+#: statistics.c:643
#, c-format
msgid "for selected dives"
msgstr "для выбранных погружений"
-#: dive.c:117
-#: divelist.c:1418
-#: info.c:1078
-#: planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "фут"
@@ -1861,8 +1809,7 @@ msgstr "фут"
msgid "full suit"
msgstr "полный"
-#: libdivecomputer.c:151
-#: libdivecomputer.c:154
+#: libdivecomputer.c:151 libdivecomputer.c:154
msgid "gaschange"
msgstr "замена смеси"
@@ -1882,9 +1829,7 @@ msgstr "неверный номер события"
msgid "jacket"
msgstr "куртка"
-#: dive.c:141
-#: equipment.c:1004
-#: gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "кг"
@@ -1892,10 +1837,7 @@ msgstr "кг"
msgid "l"
msgstr "л"
-#: dive.c:137
-#: divelist.c:1421
-#: equipment.c:1006
-#: gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "фунт"
@@ -1903,17 +1845,15 @@ msgstr "фунт"
msgid "long john"
msgstr "long john"
-#: dive.c:112
-#: info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "м"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr "макс. ppO2"
-#: divelist.c:1427
-#: gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr "макс.CNS"
@@ -1925,12 +1865,11 @@ msgstr "макс. глуб."
msgid "membrane"
msgstr "мембрана"
-#: divelist.c:1419
-#: planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "мин"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)"
@@ -1939,7 +1878,7 @@ msgstr "модель=%u (0x%08x), прошивка=%u (0x%08x), серийный
msgid "more data dive id"
msgstr "ид. дополнительных данных погружения"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "более %d дней"
@@ -1952,16 +1891,16 @@ msgstr "время без остановки"
msgid "none"
msgstr "отсутствует"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr "порог pHe"
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr "порог pN%s"
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr "порог pO%s"
@@ -2019,16 +1958,11 @@ msgstr "Sergey Starosek"
msgid "transmitter"
msgstr "передатчик"
-#: equipment.c:1345
-#: equipment.c:1365
+#: equipment.c:1345 equipment.c:1365
msgid "unkn"
msgstr "неизв"
-#: libdivecomputer.c:152
-#: print.c:317
-#: statistics.c:563
-#: statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "неизвестно"
@@ -2056,6 +1990,9 @@ msgstr "мокрый"
msgid "workload"
msgstr "нагрузка"
+#~ msgid "1 dive per page"
+#~ msgstr "1 погр. на стр."
+
#~ msgid "Automatically group dives in trips"
#~ msgstr "Автогруппировка погружений в поездке"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index b274b87fe..b077a1bc5 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: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2012-10-23 22:30+0100\n"
"Last-Translator: Ďoďo Ivanecký <dodo.sk@gmail.com>\n"
"Language-Team: Slovakian\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Mesiac"
@@ -32,48 +32,48 @@ msgstr ""
msgid " Please select dive computer and device. "
msgstr "Voľba typu počítača a zariadia. "
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr ""
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "#"
-#: print.c:322
+#: print.c:307
#, fuzzy, c-format
msgid "%.*f %s"
msgstr "%.*f %s/min"
-#: print.c:267 print.c:340
+#: print.c:252 print.c:325
#, fuzzy, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s/min"
-#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr ""
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, c-format
msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
msgstr "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d"
#. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:584
+#: print.c:575
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
msgstr "%1$s, %2$s %3$d, %4$d %5$dh%6$02d"
@@ -85,60 +85,60 @@ msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
msgstr "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
#. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:551
+#: statistics.c:549
#, c-format
msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
msgstr "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
-#: print.c:609 statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %dh %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dh %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr ""
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
"CNS:%u%%"
msgstr ""
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
"Calculated ceiling %.0f %s"
msgstr ""
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
"Deco:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
"Deco:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -147,82 +147,91 @@ msgid ""
"EADD:%d%s"
msgstr ""
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
"In deco"
msgstr ""
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
"MOD:%d%s"
msgstr ""
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
"NDL:%umin"
msgstr ""
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
"P:%d %s"
msgstr ""
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
"Safetystop:%umin @ %.0f %s"
msgstr ""
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
"Safetystop:unkn time @ %.0f %s"
msgstr ""
-#: profile.c:2107
+#: planner.c:468
+#, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
"T:%.1f %s"
msgstr ""
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
"pHe:%.2fbar"
msgstr ""
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
"pN%s:%.2fbar"
msgstr ""
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
"pO%s:%.2fbar"
msgstr ""
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) alebo (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, fuzzy, c-format
msgid "(no dives)"
msgstr "Editovať ponory"
@@ -231,53 +240,49 @@ msgstr "Editovať ponory"
msgid "(nothing)"
msgstr ""
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr ""
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr ""
-#: print.c:907
-msgid "1 dive per page"
+#: planner.c:1253
+msgid "17 l/min"
msgstr ""
-#: planner.c:1231
-msgid "17 l/min"
+#: print.c:924
+msgid "2 dives per page"
msgstr ""
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr ""
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr ""
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr ""
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr ""
-#: planner.c:1203
+#: planner.c:1197
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
-"An entry with depth, time and gas describes a segment that ends at the given "
-"depth, takes the given time (if relative, e.g. '+3:30') or ends at the given "
-"time (if absolute), and uses the given gas.\n"
+"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
-"An entry that has a depth and a gas given but no time is special; it informs "
-"the planner that the gas specified is available for the ascent once the "
-"depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr ""
@@ -289,28 +294,28 @@ msgstr "O Subsurface"
msgid "Add Dive..."
msgstr "Pridať Ponor..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Pridať ponor"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Pridať do akcie vyššie"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr ""
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr ""
-#: statistics.c:844
+#: statistics.c:847
#, fuzzy
msgid "Air Temp"
msgstr "Priemerná teplota"
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr ""
@@ -331,64 +336,64 @@ msgstr "Aug"
msgid "Autogroup"
msgstr "Automatické zgrupovanie"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Priemer"
-#: statistics.c:799 statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Priemerná hĺbka"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Priemerná spotreba"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Priemerná teplota"
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Priemerný čas"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr ""
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "bar"
-#: info.c:700 info.c:1153 print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Partner"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr ""
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr ""
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr ""
@@ -396,11 +401,11 @@ msgstr ""
msgid "Cannot parse response!"
msgstr ""
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Vyber default XML súbor"
@@ -412,7 +417,7 @@ msgstr "Vyber XML súbor pre import do aktuálneho data súboru"
msgid "Close"
msgstr "Zatvoriť"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Zredukovať všetky"
@@ -424,19 +429,19 @@ msgstr ""
msgid "Connection Error: "
msgstr ""
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Vytvoriť novú akciu nad"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "kubická stopa"
-#: divelist.c:1423 gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Fľaša"
-#: equipment.c:918 equipment.c:1029 print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Fľaša"
@@ -444,20 +449,24 @@ msgstr "Fľaša"
msgid "Cylinders"
msgstr "Fľaše"
-#: profile.c:2098
+#: profile.c:2102
#, fuzzy, c-format
msgid "D:%.1f %s"
msgstr "%.*f %s/min"
-#: divelist.c:1416 print.c:510 statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Dátum"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Dátum a čas"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Dátum:"
@@ -465,7 +474,7 @@ msgstr "Dátum:"
msgid "Dec"
msgstr "Dec"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Default XML Súbor"
@@ -473,19 +482,19 @@ msgstr "Default XML Súbor"
msgid "Delete a dive computer information entry"
msgstr ""
-#: divelist.c:2206 divelist.c:2259 divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Zmazať ponor"
-#: divelist.c:2208 divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Zmazať ponory"
-#: print.c:510 statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Hĺbka"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Hĺbka (%s):"
@@ -494,7 +503,7 @@ msgstr "Hĺbka (%s):"
msgid "Depth Limit Exceeded"
msgstr "Prekročená Maximálna Hĺbka"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Hĺbka:"
@@ -513,12 +522,12 @@ msgstr ""
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Ponor #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
-#: info.c:157 print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Ponor #%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Ponor #%d: %s %d %04d"
@@ -528,7 +537,7 @@ msgstr "Ponor #%d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Počítač"
-#: gtk-gui.c:1607 info.c:898 statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Informácie"
@@ -536,11 +545,11 @@ msgstr "Informácie"
msgid "Dive Notes"
msgstr "Poznámky"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr ""
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Čas Ponoru"
@@ -556,11 +565,11 @@ msgstr "Info: Čas Ponoru"
msgid "Dive computer vendor and product"
msgstr ""
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Chyba importu dát"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Detaily ponoru"
@@ -569,27 +578,27 @@ msgstr "Detaily ponoru"
msgid "Dive locations"
msgstr "Poznámky"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Divemaster"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr ""
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Ponor č."
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Font pre ponory"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Ponory"
@@ -620,28 +629,28 @@ msgstr "Nahratie údajov z počítača..."
msgid "Download Success!"
msgstr ""
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Dĺžka (min)"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Dĺžka (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr ""
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr ""
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr ""
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr ""
@@ -658,42 +667,40 @@ msgstr "Názov zariadenia"
msgid "Edit Dive Computer Nicknames"
msgstr ""
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Editovať akciu"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Editovať sumár"
#: gtk-gui.c:1302
-msgid ""
-"Edit a dive computer nickname by double-clicking the in the relevant "
-"nickname field"
+msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr ""
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Editovať ponor"
-#: divelist.c:2405 divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
#, fuzzy
msgid "Edit dive date/time"
msgstr "Editovať ponor"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Editovať ponory"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Editovať viac ponorov"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Editovať sumár"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Povolit / zakázať udalosti"
@@ -701,80 +708,78 @@ msgstr "Povolit / zakázať udalosti"
msgid "End"
msgstr "Koniec"
-#: planner.c:1139
+#: planner.c:1149
#, fuzzy
msgid "Ending Depth"
msgstr "Min. hĺbka"
#: webservice.c:220
-msgid ""
-"Enter a user identifier and press 'Download'. Once the download is complete "
-"you can press 'Apply' if you wish to apply the changes."
+msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr ""
-#: gtk-gui.c:1603 info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Výstroj"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
#, fuzzy
msgid "Error obtaining water salinity"
msgstr "Chyba spracovania vzoriek"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Chyba spracovania času"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Chyba spracovania času ponoru"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Chyba spracovania zmesi plynu"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Chyba spracovania dýchacích zmesí"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Chyba spracovania maximálnej hĺbky"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Chyba spracovania vzoriek"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Chyba registrácie správcu ukončenia"
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Chyba registrácie dát"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Chyba registrácia správcu udalosti."
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Udalosť: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Udalosť: Čakanie na vstup uživateľa"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Expandovať všetky"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Chyba pri otváraní %i súborov"
@@ -789,12 +794,12 @@ msgstr "Chyba pri spracovaní '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Chyba pri spracovaní '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Chyba pri načítaní '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Chyba pri načítaní '%s'.\n"
@@ -803,7 +808,7 @@ msgstr "Chyba pri načítaní '%s'.\n"
msgid "Feb"
msgstr "Feb"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "stopa"
@@ -823,48 +828,48 @@ msgstr ""
msgid "Fri"
msgstr "Pi"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr ""
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr ""
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr ""
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr ""
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr ""
-#: statistics.c:854
+#: statistics.c:857
#, fuzzy
msgctxt "Amount"
msgid "Gas Used"
msgstr "Použitá zmes"
-#: planner.c:1141
+#: planner.c:1151
#, fuzzy
msgctxt "Type of"
msgid "Gas Used"
msgstr "Použitá zmes"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr ""
-#: equipment.c:959 print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Zmes"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr ""
@@ -884,7 +889,7 @@ msgstr "Import XML súboru..."
msgid "Info"
msgstr "Info"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr ""
@@ -918,11 +923,11 @@ msgstr "Linus Torvalds, Dirk Hohndel a ďalší, 2011, 2012"
msgid "List"
msgstr "Zoznam"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "liter"
-#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Miesto"
@@ -930,12 +935,12 @@ msgstr "Miesto"
msgid "Log"
msgstr "Log"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Najdlhší"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Najdlhší ponor"
@@ -959,7 +964,7 @@ msgstr ""
msgid "Marker"
msgstr "Značka"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "Master"
@@ -967,19 +972,19 @@ msgstr "Master"
msgid "Max Deco Time Warning"
msgstr "Upozornenie: Max. dekompresný čas"
-#: statistics.c:797 statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Max. hĺbka"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Max. spotreba"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Max. teplota"
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -990,7 +995,7 @@ msgstr ""
"Dĺžka: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr ""
@@ -999,17 +1004,17 @@ msgstr ""
msgid "MaxPress"
msgstr "Max. tlak"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Maximum"
@@ -1018,51 +1023,51 @@ msgstr "Maximum"
msgid "May"
msgstr "Máj"
-#: divelist.c:2339
+#: divelist.c:2368
#, fuzzy
msgid "Merge dives"
msgstr "Zmazať ponory"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Spoj akciu s akciou nad"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Spoj akciu s akciou pod"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "meter"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Min. hĺbka"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Min. spotreba"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Min. teplota"
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Rôzne voľby"
@@ -1078,7 +1083,7 @@ msgstr "Po"
msgid "Multi-platform divelog software in C"
msgstr "Multiplatformový SW na správu ponorov v C"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr ""
@@ -1086,7 +1091,7 @@ msgstr ""
msgid "New"
msgstr "Nový"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Nové začiatočné číslo"
@@ -1103,7 +1108,7 @@ msgstr "Názov zariadenia"
msgid "No Tank Data"
msgstr "Žiadne informácie o fľaši"
-#: info.c:611 info.c:725 info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Poznámky"
@@ -1115,7 +1120,7 @@ msgstr "Nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1124,7 +1129,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "Okt"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Nešpecifikovaná PTHREAD chyba"
@@ -1132,7 +1137,7 @@ msgstr "Nešpecifikovaná PTHREAD chyba"
msgid "Ok to delete the selected entry?"
msgstr ""
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Otvoriť súbor"
@@ -1140,7 +1145,7 @@ msgstr "Otvoriť súbor"
msgid "Open..."
msgstr "Otvoriť..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr ""
@@ -1161,11 +1166,11 @@ msgstr "PO2 Upozornenie: Výstup"
msgid "PO2 Green Warning"
msgstr "PO2 Upozornenie: Zelená"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "psi"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr ""
@@ -1173,7 +1178,7 @@ msgstr ""
msgid "Planner"
msgstr ""
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Nastavenia"
@@ -1185,7 +1190,7 @@ msgstr "Nastavenia..."
msgid "Pressure"
msgstr "Tlak"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Tlak:"
@@ -1193,15 +1198,15 @@ msgstr "Tlak:"
msgid "Prev DC"
msgstr ""
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Tlačiť vybrané ponory"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Tlačiť výber"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Druh tlače"
@@ -1213,7 +1218,7 @@ msgstr "Tlačiť..."
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
#, fuzzy
msgid "Profile Settings"
msgstr "Profil"
@@ -1230,7 +1235,7 @@ msgstr "Alarm: zostávajúci čas plynu"
msgid "RGT Warning"
msgstr "Upozornenie: zostávajúci čas plynu"
-#: info.c:705 info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Rating"
@@ -1239,19 +1244,19 @@ msgstr "Rating"
msgid "Reading %s %s"
msgstr "Načítavam ponor %s"
-#: divelist.c:2051 divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Vymaž akciu"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Vymaž ponor z akcie"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Vymaž vybrané ponory z akcie"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Prečíslovanie"
@@ -1263,20 +1268,20 @@ msgstr "Prečíslovanie..."
msgid "Retry"
msgstr "Skús znovu"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr ""
-#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "Spotreba plynu"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr ""
-#: planner.c:1235
+#: planner.c:1257
#, fuzzy
msgid "SAC during dive"
msgstr "Pridať ponor"
@@ -1297,24 +1302,29 @@ msgstr "So"
msgid "Save As..."
msgstr "Uložiť ako..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Uložiť zmeny?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Uložiť súbor ako"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Uložiť ako..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Uložiť..."
-#: planner.c:1140
+#: planner.c:1150
#, fuzzy
msgid "Segment Time"
msgstr "Priemerný čas"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
#, fuzzy
msgid "Select Events"
msgstr "Voľba udalosti"
@@ -1336,54 +1346,54 @@ msgstr ""
"Čiastočný zápis do req.txt súboru\n"
"Je Uemis Zurich korektne pripojený?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Najkratší"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Najkratší ponor"
-#: gtk-gui.c:653 gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Zobraz stĺpce"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr ""
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr ""
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr ""
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr ""
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr ""
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr ""
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr ""
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr ""
-#: planner.c:191
+#: planner.c:192
#, fuzzy
msgid "Simulated Dive"
msgstr "Zmazať Ponor"
@@ -1404,15 +1414,15 @@ msgstr "Upozornenie: Rýchlosť"
msgid "Start"
msgstr "Štart"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr ""
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Štatistika"
-#: statistics.c:705
+#: statistics.c:708
#, fuzzy, c-format
msgid "Statistics %s"
msgstr "Štatistika"
@@ -1426,20 +1436,12 @@ msgstr "Štatistiky"
msgid "Status"
msgstr "Štatistiky"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-
-#: divelist.c:1422 gtk-gui.c:684 info.c:706 info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Oblek"
@@ -1448,20 +1450,20 @@ msgstr "Oblek"
msgid "Sun"
msgstr "Ne"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Povrchový interval"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr ""
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr ""
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Tlač tabuľky"
@@ -1473,19 +1475,19 @@ msgstr "Odporúčaná zmena fľaše"
msgid "Tank Pressure Info"
msgstr "Info: Tlak vo fľaši"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr ""
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Teplota"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Teplota"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Teplota:"
@@ -1497,7 +1499,7 @@ msgstr "Kombinovaný"
msgid "Thu"
msgstr "Št"
-#: info.c:1016 print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Čas"
@@ -1511,21 +1513,21 @@ msgstr ""
msgid "Toggle Zoom"
msgstr "Zmeň veľkosť"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Celkový čas"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Celkový čas"
-#: print.c:336
+#: print.c:321
#, fuzzy, c-format
msgid "Total Weight:"
msgstr "Závažie:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr ""
@@ -1567,25 +1569,25 @@ msgstr ""
"Odpoj a znovu pripoj počítač\n"
"a skus znovu"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Uemis - inicializácia neúspešná"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Problém inicializácie libdivecomputer"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Nie je možné spracovať %s %s"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Nie je možné otvoriť %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Jednotky"
@@ -1597,19 +1599,19 @@ msgstr ""
msgid "View"
msgstr "Náhľad"
-#: info.c:711 statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr ""
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Objem:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr ""
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Teplota vody"
@@ -1621,28 +1623,28 @@ msgstr ""
msgid "Wed"
msgstr "St"
-#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Závažie"
-#: equipment.c:1084 print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Závažie"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Závažie:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML súbor"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "Rok"
-#: gtk-gui.c:1371 statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Ročná štatistika"
@@ -1651,14 +1653,11 @@ msgstr "Ročná štatistika"
msgid ""
"You already have a dive computer of this model\n"
"named %s\n"
-"Subsurface can maintain a nickname for this device to distinguish it from "
-"the existing one. The default is the model and device ID as shown below.\n"
-"If you don't want to name this dive computer click 'Cancel' and Subsurface "
-"will simply display its model as its name (which may mean that you cannot "
-"tell the two dive computers apart in the logs)."
+"Subsurface can maintain a nickname for this device to distinguish it from the existing one. The default is the model and device ID as shown below.\n"
+"If you don't want to name this dive computer click 'Cancel' and Subsurface will simply display its model as its name (which may mean that you cannot tell the two dive computers apart in the logs)."
msgstr ""
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1666,7 +1665,7 @@ msgstr ""
"Máš neuložené zmeny.\n"
"Chceš ich uložiť pred zatvorením súboru?"
-#: gtk-gui.c:211 gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1675,7 +1674,8 @@ msgstr ""
"Máš neuložené zmeny v súbore %s \n"
"Chceš ich uložiť pred zatvorením súboru?"
-#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
+#: profile.c:399
#, c-format
msgid "air"
msgstr "vzduch"
@@ -1720,7 +1720,7 @@ msgstr "strop (bezpečnostná zastávka)"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91 planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "cuft"
@@ -1753,37 +1753,37 @@ msgstr "čas ponoru"
msgid "drysuit"
msgstr ""
-#: planner.c:727
+#: planner.c:734
#, fuzzy
msgid "ean"
msgstr "Jan"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr ""
-#: statistics.c:674
+#: statistics.c:677
#, fuzzy, c-format
msgid "for dive #%d"
msgstr "Ponor #%d - "
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr ""
-#: statistics.c:676
+#: statistics.c:679
#, fuzzy, c-format
msgid "for selected dive"
msgstr "Tlačiť vybrané ponory"
-#: statistics.c:640
+#: statistics.c:643
#, fuzzy, c-format
msgid "for selected dives"
msgstr "Tlačiť vybrané ponory"
-#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1811,7 +1811,7 @@ msgstr "neplatné číslo udalosti"
msgid "jacket"
msgstr ""
-#: dive.c:141 equipment.c:1004 gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1819,7 +1819,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "US libra"
@@ -1827,15 +1827,15 @@ msgstr "US libra"
msgid "long john"
msgstr ""
-#: dive.c:112 info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr ""
-#: divelist.c:1427 gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr ""
@@ -1847,11 +1847,11 @@ msgstr "max. hĺbka"
msgid "membrane"
msgstr ""
-#: divelist.c:1419 planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
@@ -1861,7 +1861,7 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgid "more data dive id"
msgstr "viac než %d dní"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "viac než %d dní"
@@ -1874,16 +1874,16 @@ msgstr ""
msgid "none"
msgstr "žiaden"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr ""
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr ""
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr ""
@@ -1945,8 +1945,7 @@ msgstr "vysielač"
msgid "unkn"
msgstr "nez."
-#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "neznámy"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index ebacceba2..889115782 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: 2013-02-04 17:58+1100\n"
+"POT-Creation-Date: 2013-02-09 10:31-0800\n"
"PO-Revision-Date: 2013-02-08 13:51+0100\n"
"Last-Translator: Linus Torvalds <torvalds@linux-foundation.org>\n"
"Language-Team: Swedish\n"
@@ -20,7 +20,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: statistics.c:184
+#: statistics.c:177
msgctxt "Stats"
msgid " > Month"
msgstr " > Månad"
@@ -33,52 +33,48 @@ msgstr "Ladda ned"
msgid " Please select dive computer and device. "
msgstr " Välj dykdator och enhet"
-#: profile.c:412
+#: profile.c:413
msgctxt "Starts with space!"
msgid " begin"
msgstr "start"
-#: profile.c:413
+#: profile.c:414
msgctxt "Starts with space!"
msgid " end"
msgstr "slut"
-#: statistics.c:182
+#: statistics.c:175
msgid "#"
msgstr "#"
-#: print.c:322
+#: print.c:307
#, c-format
msgid "%.*f %s"
msgstr "%.*f %s"
-#: print.c:267
-#: print.c:340
+#: print.c:252 print.c:325
#, c-format
msgid "%.*f %s\n"
msgstr "%.*f %s\n"
-#: statistics.c:588
-#: statistics.c:735
-#: statistics.c:737
-#: statistics.c:739
+#: statistics.c:591 statistics.c:738 statistics.c:740 statistics.c:742
#, c-format
msgid "%.*f %s/min"
msgstr "%.*f %s/min"
-#: planner.c:540
+#: planner.c:547
#, c-format
msgid "%.0f%s of %s\n"
msgstr "%.0f%s av %s\n"
#. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min
-#: print.c:76
+#: print.c:81
#, 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:584
+#: print.c:575
#, 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"
@@ -90,33 +86,32 @@ 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:551
+#: statistics.c:549
#, 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:609
-#: statistics.c:558
+#: print.c:600 statistics.c:556
#, c-format
msgid "%d min"
msgstr "%d min"
-#: statistics.c:528
+#: statistics.c:521
#, c-format
msgid "%dd %dh %dmin"
msgstr "%dd %dt %dmin"
-#: statistics.c:530
+#: statistics.c:523
#, c-format
msgid "%dh %dmin"
msgstr "%dt %dmin"
-#: print.c:318
+#: print.c:303
#, c-format
msgid "%s"
msgstr "%s"
-#: profile.c:2144
+#: profile.c:2148
#, c-format
msgid ""
"%s\n"
@@ -125,7 +120,7 @@ msgstr ""
"%s\n"
"CNS:%u%%"
-#: profile.c:2112
+#: profile.c:2116
#, c-format
msgid ""
"%s\n"
@@ -134,7 +129,7 @@ msgstr ""
"%s\n"
"Beräknat tak %.0f %s"
-#: profile.c:2128
+#: profile.c:2132
#, c-format
msgid ""
"%s\n"
@@ -143,7 +138,7 @@ msgstr ""
"%s\n"
"Deko:%umin @ %.0f %s"
-#: profile.c:2131
+#: profile.c:2135
#, c-format
msgid ""
"%s\n"
@@ -152,7 +147,7 @@ msgstr ""
"%s\n"
"Deko:okänd tid @ %.0f %s"
-#: profile.c:2168
+#: profile.c:2172
#, c-format
msgid ""
"%s\n"
@@ -165,7 +160,7 @@ msgstr ""
"END:%d%s\n"
"EADD:%d%s"
-#: profile.c:2137
+#: profile.c:2141
#, c-format
msgid ""
"%s\n"
@@ -174,7 +169,7 @@ msgstr ""
"%s\n"
"I deco"
-#: profile.c:2161
+#: profile.c:2165
#, c-format
msgid ""
"%s\n"
@@ -183,7 +178,7 @@ msgstr ""
"%s\n"
"MOD:%d%s"
-#: profile.c:2140
+#: profile.c:2144
#, c-format
msgid ""
"%s\n"
@@ -192,7 +187,7 @@ msgstr ""
"%s\n"
"NDL:%umin"
-#: profile.c:2102
+#: profile.c:2106
#, c-format
msgid ""
"%s\n"
@@ -201,7 +196,7 @@ msgstr ""
"%s\n"
"P:%d %s"
-#: profile.c:2120
+#: profile.c:2124
#, c-format
msgid ""
"%s\n"
@@ -210,7 +205,7 @@ msgstr ""
"%s\n"
"Såkerhetsstopp:%umin @ %.0f %s"
-#: profile.c:2123
+#: profile.c:2127
#, c-format
msgid ""
"%s\n"
@@ -219,7 +214,19 @@ msgstr ""
"%s\n"
"Säkerhetsstopp:okänd tid @ %.0f %s"
-#: profile.c:2107
+#: planner.c:468
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"Subsurface dive plan\n"
+"based on GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+msgstr ""
+"Subsurface dykplan\n"
+"baserad på GFlow = %.0f and GFhigh = %.0f\n"
+"\n"
+
+#: profile.c:2111
#, c-format
msgid ""
"%s\n"
@@ -228,7 +235,7 @@ msgstr ""
"%s\n"
"T:%.1f %s"
-#: profile.c:2156
+#: profile.c:2160
#, c-format
msgid ""
"%s\n"
@@ -237,7 +244,7 @@ msgstr ""
"%s\n"
"pHe:%.2fbar"
-#: profile.c:2152
+#: profile.c:2156
#, c-format
msgid ""
"%s\n"
@@ -246,7 +253,7 @@ msgstr ""
"%s\n"
"pN%s:%.2fbar"
-#: profile.c:2148
+#: profile.c:2152
#, c-format
msgid ""
"%s\n"
@@ -255,12 +262,12 @@ msgstr ""
"%s\n"
"pO%s:%.2fbar"
-#: dive.c:762
+#: dive.c:873
#, c-format
msgid "(%s) or (%s)"
msgstr "(%s) eller (%s)"
-#: statistics.c:680
+#: statistics.c:683
#, c-format
msgid "(no dives)"
msgstr "(inga dyk)"
@@ -269,46 +276,48 @@ msgstr "(inga dyk)"
msgid "(nothing)"
msgstr "(inget)"
-#: planner.c:1226
+#: planner.c:1248
msgid "0.6 cuft/min"
msgstr "0.6 ft³/min"
-#: planner.c:1225
+#: planner.c:1247
msgid "0.7 cuft/min"
msgstr "0.7 ft³/min"
-#: print.c:907
-msgid "1 dive per page"
-msgstr "1 dyk per sida"
-
-#: planner.c:1231
+#: planner.c:1253
msgid "17 l/min"
msgstr "17 l/min"
+#: print.c:924
+#, fuzzy
+msgid "2 dives per page"
+msgstr "6 dyk per sida"
+
#: uemis-downloader.c:590
msgid "2 pcs full suit"
msgstr "2 pcs full suit"
-#: planner.c:1230
+#: planner.c:1252
msgid "20 l/min"
msgstr "20 l/min"
-#: gtk-gui.c:833
+#: gtk-gui.c:837
msgid "3m increments for calculated ceiling"
msgstr "beräknat tak i 3m steg"
-#: print.c:903
+#: print.c:920
msgid "6 dives per page"
msgstr "6 dyk per sida"
-#: planner.c:1203
+#: planner.c:1197
+#, fuzzy
msgid ""
"<small>Add segments below.\n"
"Each line describes part of the planned dive.\n"
"An entry with depth, time and gas describes a segment that ends at the given depth, takes the given time (if relative, e.g. '+3:30') or ends at the given time (if absolute), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
"An entry that has a depth and a gas given but no time is special; it informs the planner that the gas specified is available for the ascent once the depth given has been reached.\n"
-"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>"
+"CC SetPoint specifies CC (rebreather) dives, leave empty for OC.</small>\n"
msgstr ""
"<small>Lägg till dyksegment nedan.\n"
"Var rad beskriver en del av den planerade dykningen.\n"
@@ -317,12 +326,11 @@ msgstr ""
"En rad som har ett djup och gas men ingen tid är speciell; det informerar pleneringen att den gasen kan användas för planering när planen överskrider det givna djpet.\n"
"CC SetPoint används for CC (rebreather) dykningar, lämna tomt för OC.</small>"
-#: planner.c:1113
+#: planner.c:1123
msgid "AIR"
msgstr "LUFT"
-#: gtk-gui.c:1054
-#: gtk-gui.c:1377
+#: gtk-gui.c:1054 gtk-gui.c:1377
msgid "About Subsurface"
msgstr "Om Subsurface"
@@ -330,27 +338,27 @@ msgstr "Om Subsurface"
msgid "Add Dive..."
msgstr "Nytt dyk..."
-#: divelist.c:2364
+#: divelist.c:2393
msgid "Add dive"
msgstr "Nytt dyk"
-#: divelist.c:2462
+#: divelist.c:2495
msgid "Add to trip above"
msgstr "Kombinera med resan ovan"
-#: planner.c:1250
+#: planner.c:1272
msgid "Add waypoint"
msgstr "Lägg till"
-#: statistics.c:845
+#: statistics.c:848
msgid "Air Press"
msgstr "Lufttryck"
-#: statistics.c:844
+#: statistics.c:847
msgid "Air Temp"
msgstr "Lufttemp"
-#: info.c:714
+#: info.c:812
#, c-format
msgid "Air Temp in %s"
msgstr "Lufttemp i %s"
@@ -371,67 +379,64 @@ msgstr "aug"
msgid "Autogroup"
msgstr "Gruppera automatiskt"
-#: statistics.c:190
+#: statistics.c:183
msgctxt "Depth"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:187
+#: statistics.c:180
msgctxt "Duration"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:193
+#: statistics.c:186
msgctxt "SAC"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:196
+#: statistics.c:189
msgctxt "Temp"
msgid "Average"
msgstr "Genomsnitt"
-#: statistics.c:799
-#: statistics.c:836
+#: statistics.c:802 statistics.c:839
msgid "Avg Depth"
msgstr "Medeldjup"
-#: statistics.c:807
+#: statistics.c:810
msgid "Avg SAC"
msgstr "Medel-SAC"
-#: statistics.c:782
+#: statistics.c:785
msgid "Avg Temp"
msgstr "Medel-temp"
-#: statistics.c:789
+#: statistics.c:792
msgid "Avg Time"
msgstr "Medel-tid"
-#: profile.c:408
+#: profile.c:410
#, c-format
msgid "Bailing out to OC"
msgstr "Bailout till öppet system"
-#: gtk-gui.c:634
+#: gtk-gui.c:638
msgid "Bar"
msgstr "bar"
-#: info.c:700
-#: info.c:1153
-#: print.c:511
+#: info.c:798 info.c:1251 print.c:502
msgid "Buddy"
msgstr "Parkamrat"
-#: planner.c:1142
+#: planner.c:1152
msgid "CC SetPoint"
msgstr "CC SetPoint"
-#: uemis-downloader.c:908
+#: uemis-downloader.c:932
msgid "Cancelled, exiting cleanly..."
msgstr "Avbrutet ..."
-#: libdivecomputer.c:756
+#: libdivecomputer.c:757
msgid "Cancelled..."
msgstr "Avbrutet ..."
@@ -439,11 +444,11 @@ msgstr "Avbrutet ..."
msgid "Cannot parse response!"
msgstr "Kan inte tolka respons"
-#: gtk-gui.c:644
+#: gtk-gui.c:648
msgid "Celsius"
msgstr "Celsius"
-#: gtk-gui.c:556
+#: gtk-gui.c:560
msgid "Choose Default XML File"
msgstr "Välj standard XML-fil"
@@ -455,7 +460,7 @@ msgstr "Välj vilka XML-filer du vill importera"
msgid "Close"
msgstr "Stäng"
-#: divelist.c:2480
+#: divelist.c:2513
msgid "Collapse all"
msgstr "Sammanslå alla"
@@ -467,22 +472,19 @@ msgstr "Kontaktar..."
msgid "Connection Error: "
msgstr "Kontaktfel:"
-#: divelist.c:2452
+#: divelist.c:2485
msgid "Create new trip above"
msgstr "Ny resa innan"
-#: gtk-gui.c:640
+#: gtk-gui.c:644
msgid "CuFt"
msgstr "ft^3"
-#: divelist.c:1423
-#: gtk-gui.c:664
+#: divelist.c:1427 gtk-gui.c:668
msgid "Cyl"
msgstr "Cyl"
-#: equipment.c:918
-#: equipment.c:1029
-#: print.c:205
+#: equipment.c:918 equipment.c:1029 print.c:194
msgid "Cylinder"
msgstr "Flaska"
@@ -490,22 +492,24 @@ msgstr "Flaska"
msgid "Cylinders"
msgstr "Flaskor"
-#: profile.c:2098
+#: profile.c:2102
#, c-format
msgid "D:%.1f %s"
msgstr "D:%.1f %s"
-#: divelist.c:1416
-#: print.c:510
-#: statistics.c:827
+#: planner.c:1209
+msgid "DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE."
+msgstr ""
+
+#: divelist.c:1420 print.c:501 statistics.c:830
msgid "Date"
msgstr "Datum"
-#: info.c:1001
+#: info.c:1099
msgid "Date and Time"
msgstr "Datum och tid"
-#: info.c:1011
+#: info.c:1109
msgid "Date:"
msgstr "Datum:"
@@ -513,7 +517,7 @@ msgstr "Datum:"
msgid "Dec"
msgstr "dec"
-#: gtk-gui.c:701
+#: gtk-gui.c:705
msgid "Default XML Data File"
msgstr "Standard XML-fil"
@@ -521,23 +525,19 @@ msgstr "Standard XML-fil"
msgid "Delete a dive computer information entry"
msgstr "Radera dykdatorinformation"
-#: divelist.c:2206
-#: divelist.c:2259
-#: divelist.c:2351
+#: divelist.c:2235 divelist.c:2288 divelist.c:2380
msgid "Delete dive"
msgstr "Radera dyk"
-#: divelist.c:2208
-#: divelist.c:2350
+#: divelist.c:2237 divelist.c:2379
msgid "Delete dives"
msgstr "Radera dyk"
-#: print.c:510
-#: statistics.c:182
+#: print.c:501 statistics.c:175
msgid "Depth"
msgstr "Djup"
-#: info.c:1078
+#: info.c:1176
#, c-format
msgid "Depth (%s):"
msgstr "Djup (%s):"
@@ -546,7 +546,7 @@ msgstr "Djup (%s):"
msgid "Depth Limit Exceeded"
msgstr "Maxdjup har överskridits"
-#: gtk-gui.c:628
+#: gtk-gui.c:632
msgid "Depth:"
msgstr "Djup:"
@@ -564,13 +564,12 @@ msgstr "Enhet eller monteringspunkt"
msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
msgstr "Dyk #%1$d - %2$s %4$02d.%3$02d.%5$04d kl %6$d:%7$02d"
-#: info.c:157
-#: print.c:71
+#: info.c:157 print.c:76
#, c-format
msgid "Dive #%d - "
msgstr "Dyk #%d - "
-#: libdivecomputer.c:435
+#: libdivecomputer.c:436
#, c-format
msgid "Dive %d: %s %d %04d"
msgstr "Dyk #%d: %s %d %04d"
@@ -579,9 +578,7 @@ msgstr "Dyk #%d: %s %d %04d"
msgid "Dive Computer Nickname"
msgstr "Dykdatornamn"
-#: gtk-gui.c:1607
-#: info.c:898
-#: statistics.c:818
+#: gtk-gui.c:1607 info.c:996 statistics.c:821
msgid "Dive Info"
msgstr "Information"
@@ -589,11 +586,11 @@ msgstr "Information"
msgid "Dive Notes"
msgstr "Dykanteckningar"
-#: planner.c:1194
+#: planner.c:1219
msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
msgstr "Dykplan - DETTA ÄR BARA EN SIMULATION; ANVÄND INTE FÖR DYKNING"
-#: statistics.c:828
+#: statistics.c:831
msgid "Dive Time"
msgstr "Dyktid"
@@ -609,11 +606,11 @@ msgstr "Dyktidsnot"
msgid "Dive computer vendor and product"
msgstr "Dykdatorleverantör och produkt"
-#: libdivecomputer.c:680
+#: libdivecomputer.c:681
msgid "Dive data import error"
msgstr "Lyckades inte importera dykdata"
-#: print.c:893
+#: print.c:910
msgid "Dive details"
msgstr "Detaljer"
@@ -621,27 +618,27 @@ msgstr "Detaljer"
msgid "Dive locations"
msgstr "Dykplatser"
-#: info.c:699
+#: info.c:797
msgid "Dive master"
msgstr "Divemaster"
-#: planner.c:1219
+#: planner.c:1241
msgid "Dive starts when?"
msgstr "När börjar dyket?"
-#: print.c:510
+#: print.c:501
msgid "Dive#"
msgstr "Dyknr"
-#: gtk-gui.c:689
+#: gtk-gui.c:693
msgid "Divelist Font"
msgstr "Font för dyklistan"
-#: info.c:1152
+#: info.c:1250
msgid "Divemaster"
msgstr "Divemaster"
-#: statistics.c:779
+#: statistics.c:782
msgid "Dives"
msgstr "Dyk"
@@ -669,28 +666,28 @@ msgstr "Ladda ned från webbtjänst..."
msgid "Download Success!"
msgstr "Nedladdning lyckades!"
-#: statistics.c:182
+#: statistics.c:175
msgid "Duration"
msgstr "Varaktighet"
-#: info.c:1073
+#: info.c:1171
msgid "Duration (min)"
msgstr "Varaktighet (min)"
-#: info.c:629
+#: info.c:655
msgid "E"
msgstr "E"
-#: planner.c:76
+#: planner.c:77
#, c-format
msgid "EAN%d"
msgstr "EAN%d"
-#: planner.c:1114
+#: planner.c:1124
msgid "EAN32"
msgstr "EAN32"
-#: planner.c:1115
+#: planner.c:1125
msgid "EAN36"
msgstr "EAN36"
@@ -706,11 +703,11 @@ msgstr "Ändra Enhetsnamn"
msgid "Edit Dive Computer Nicknames"
msgstr "Ändra dykdatorers namn"
-#: info.c:857
+#: info.c:955
msgid "Edit Trip Info"
msgstr "Ändra reseinformation"
-#: divelist.c:2372
+#: divelist.c:2401
msgid "Edit Trip Summary"
msgstr "Ändra resesammandrag"
@@ -718,37 +715,35 @@ msgstr "Ändra resesammandrag"
msgid "Edit a dive computer nickname by double-clicking the in the relevant nickname field"
msgstr "Ändra dykdatorns namn genom att dubbel-klicka på namnfältet"
-#: divelist.c:2348
+#: divelist.c:2377
msgid "Edit dive"
msgstr "Redigera dyk"
-#: divelist.c:2405
-#: divelist.c:2424
+#: divelist.c:2434 divelist.c:2457
msgid "Edit dive date/time"
msgstr "Redigera dyk datum/tid"
-#: divelist.c:2347
+#: divelist.c:2376
msgid "Edit dives"
msgstr "Redigera dyk"
-#: info.c:669
+#: info.c:763
msgid "Edit multiple dives"
msgstr "Redigera flera dyk"
-#: info.c:601
+#: info.c:619
msgid "Edit trip summary"
msgstr "Redigera resesammandrag"
-#: gtk-gui.c:953
+#: gtk-gui.c:957
msgid "Enable / Disable Events"
msgstr "Aktivera / Inaktivera händelser"
-#: equipment.c:949
-#: equipment.c:1456
+#: equipment.c:949 equipment.c:1456
msgid "End"
msgstr "Slut"
-#: planner.c:1139
+#: planner.c:1149
msgid "Ending Depth"
msgstr "Slutdjup"
@@ -756,69 +751,68 @@ msgstr "Slutdjup"
msgid "Enter a user identifier and press 'Download'. Once the download is complete you can press 'Apply' if you wish to apply the changes."
msgstr "Ange ditt användarid och tryck 'Ladda ner'. När laddningen är färdig kan du trycka på 'Använd' för att använda data"
-#: gtk-gui.c:1603
-#: info.c:733
+#: gtk-gui.c:1603 info.c:831
msgid "Equipment"
msgstr "Utrustning"
-#: libdivecomputer.c:470
+#: libdivecomputer.c:471
msgid "Error obtaining water salinity"
msgstr "Kunde inte ladda vattnets salthalt"
-#: libdivecomputer.c:418
+#: libdivecomputer.c:419
msgid "Error parsing the datetime"
msgstr "Kunde inte tolka tid och datum"
-#: libdivecomputer.c:440
+#: libdivecomputer.c:441
msgid "Error parsing the divetime"
msgstr "Kunde inte tolka dyktid"
-#: libdivecomputer.c:479
+#: libdivecomputer.c:480
msgid "Error parsing the gas mix"
msgstr "Kunde inte tolka gasblandning"
-#: libdivecomputer.c:460
+#: libdivecomputer.c:461
msgid "Error parsing the gas mix count"
msgstr "Kunde inte tolka antal gasblandningar"
-#: libdivecomputer.c:450
+#: libdivecomputer.c:451
msgid "Error parsing the maxdepth"
msgstr "Kunde inte tolka maxdjup"
-#: libdivecomputer.c:487
+#: libdivecomputer.c:488
msgid "Error parsing the samples"
msgstr "Kunde inte tolka sampel"
-#: libdivecomputer.c:676
+#: libdivecomputer.c:677
msgid "Error registering the cancellation handler."
msgstr "Kunde inte registrera avbrytningsrutin"
-#: libdivecomputer.c:409
+#: libdivecomputer.c:410
msgid "Error registering the data"
msgstr "Kunde inte registrera parser-data"
-#: libdivecomputer.c:671
+#: libdivecomputer.c:672
msgid "Error registering the event handler."
msgstr "Kunde inte registrera event-funktion"
-#: libdivecomputer.c:644
+#: libdivecomputer.c:645
#, c-format
msgid "Event: systime=%<PRId64>, devtime=%u\n"
msgstr "Event: systime=%<PRId64>, devtime=%u\n"
-#: libdivecomputer.c:621
+#: libdivecomputer.c:622
msgid "Event: waiting for user action"
msgstr "Händelse: väntar på användaren"
-#: divelist.c:2476
+#: divelist.c:2509
msgid "Expand all"
msgstr "Expandera alla"
-#: gtk-gui.c:645
+#: gtk-gui.c:649
msgid "Fahrenheit"
msgstr "Fahrenheit"
-#: gtk-gui.c:112
+#: gtk-gui.c:116
#, c-format
msgid "Failed to open %i files."
msgstr "Kunde inte öppna %i filer."
@@ -833,12 +827,12 @@ msgstr "Kunde inte läsa '%s'"
msgid "Failed to parse '%s'.\n"
msgstr "Kunde inte läsa '%s'.\n"
-#: file.c:265
+#: file.c:267
#, c-format
msgid "Failed to read '%s'"
msgstr "Kunde inte öppna '%s'"
-#: file.c:261
+#: file.c:263
#, c-format
msgid "Failed to read '%s'.\n"
msgstr "Kunde inte öppna '%s'.\n"
@@ -847,7 +841,7 @@ msgstr "Kunde inte öppna '%s'.\n"
msgid "Feb"
msgstr "feb"
-#: gtk-gui.c:630
+#: gtk-gui.c:634
msgid "Feet"
msgstr "fot"
@@ -867,47 +861,46 @@ msgstr "Tvinga nedladdning av alla dyk"
msgid "Fri"
msgstr "fre"
-#: gtk-gui.c:851
+#: gtk-gui.c:855
msgid "GFhigh"
msgstr "GFhigh"
-#: planner.c:1242
+#: planner.c:1264
msgid "GFhigh for plan"
msgstr "GFhigh för dykplanering"
-#: gtk-gui.c:841
+#: gtk-gui.c:845
msgid "GFlow"
msgstr "GFlow"
-#: planner.c:1241
+#: planner.c:1263
msgid "GFlow for plan"
msgstr "GFlow för dykplanering"
-#: info.c:683
+#: info.c:775
msgid "GPS (WGS84 or GPS format)"
msgstr "GPS (WGS84 eller GPS format)"
-#: statistics.c:854
+#: statistics.c:857
msgctxt "Amount"
msgid "Gas Used"
msgstr "Gasanvändning"
-#: planner.c:1141
+#: planner.c:1151
msgctxt "Type of"
msgid "Gas Used"
msgstr "Gasanvändning"
-#: planner.c:529
+#: planner.c:536
#, c-format
msgid "Gas consumption:\n"
msgstr "Gasanvändning:\n"
-#: equipment.c:959
-#: print.c:205
+#: equipment.c:959 print.c:194
msgid "Gasmix"
msgstr "Gasblandning"
-#: gtk-gui.c:621
+#: gtk-gui.c:625
msgid "General Settings"
msgstr "Allmänna Iinställningar"
@@ -927,7 +920,7 @@ msgstr "Importera XML-fil(er)..."
msgid "Info"
msgstr "Info"
-#: uemis-downloader.c:761
+#: uemis-downloader.c:769
msgid "Init Communication"
msgstr "Initierar anslutning"
@@ -960,15 +953,11 @@ msgstr "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
msgid "List"
msgstr "Lista"
-#: gtk-gui.c:639
+#: gtk-gui.c:643
msgid "Liter"
msgstr "liter"
-#: divelist.c:1428
-#: info.c:606
-#: info.c:676
-#: info.c:1147
-#: print.c:511
+#: divelist.c:1432 info.c:624 info.c:770 info.c:1245 print.c:502
msgid "Location"
msgstr "Plats"
@@ -976,12 +965,12 @@ msgstr "Plats"
msgid "Log"
msgstr "Log"
-#: statistics.c:189
+#: statistics.c:182
msgctxt "Duration"
msgid "Longest"
msgstr "Längsta"
-#: statistics.c:790
+#: statistics.c:793
msgid "Longest Dive"
msgstr "Längsta dyk"
@@ -1005,7 +994,7 @@ msgstr "Markera platsen här"
msgid "Marker"
msgstr "markering"
-#: print.c:510
+#: print.c:501
msgid "Master"
msgstr "master"
@@ -1013,20 +1002,19 @@ msgstr "master"
msgid "Max Deco Time Warning"
msgstr "Varning: max dekotid"
-#: statistics.c:797
-#: statistics.c:835
+#: statistics.c:800 statistics.c:838
msgid "Max Depth"
msgstr "Maxdjup"
-#: statistics.c:805
+#: statistics.c:808
msgid "Max SAC"
msgstr "Max SAC"
-#: statistics.c:780
+#: statistics.c:783
msgid "Max Temp"
msgstr "Max temp"
-#: print.c:103
+#: print.c:102
#, c-format
msgid ""
"Max depth: %.*f %s\n"
@@ -1037,7 +1025,7 @@ msgstr ""
"Tid: %d min\n"
"%s"
-#: print.c:385
+#: print.c:372
#, c-format
msgid "Max. CNS"
msgstr "Max. CNS"
@@ -1046,17 +1034,17 @@ msgstr "Max. CNS"
msgid "MaxPress"
msgstr "Max tryck"
-#: statistics.c:192
+#: statistics.c:185
msgctxt "Depth"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:195
+#: statistics.c:188
msgctxt "SAC"
msgid "Maximum"
msgstr "Maximum"
-#: statistics.c:198
+#: statistics.c:191
msgctxt "Temp"
msgid "Maximum"
msgstr "Maximum"
@@ -1065,50 +1053,50 @@ msgstr "Maximum"
msgid "May"
msgstr "maj"
-#: divelist.c:2339
+#: divelist.c:2368
msgid "Merge dives"
msgstr "Sammanslå dyk"
-#: divelist.c:2380
+#: divelist.c:2409
msgid "Merge trip with trip above"
msgstr "Sammanfoga resa med tidigare resa"
-#: divelist.c:2390
+#: divelist.c:2419
msgid "Merge trip with trip below"
msgstr "Sammanfoga resa med senare resa"
-#: gtk-gui.c:629
+#: gtk-gui.c:633
msgid "Meter"
msgstr "meter"
-#: statistics.c:798
+#: statistics.c:801
msgid "Min Depth"
msgstr "Min. djup"
-#: statistics.c:806
+#: statistics.c:809
msgid "Min SAC"
msgstr "Min. SAC"
-#: statistics.c:781
+#: statistics.c:784
msgid "Min Temp"
msgstr "Min. temp"
-#: statistics.c:191
+#: statistics.c:184
msgctxt "Depth"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:194
+#: statistics.c:187
msgctxt "SAC"
msgid "Minimum"
msgstr "Minimum"
-#: statistics.c:197
+#: statistics.c:190
msgctxt "Temp"
msgid "Minimum"
msgstr "Minimum"
-#: gtk-gui.c:695
+#: gtk-gui.c:699
msgid "Misc. Options"
msgstr "Diverse inställningar"
@@ -1124,7 +1112,7 @@ msgstr "mån"
msgid "Multi-platform divelog software in C"
msgstr "Dyklogg i C for flera platformer"
-#: info.c:628
+#: info.c:654
msgid "N"
msgstr "N"
@@ -1132,7 +1120,7 @@ msgstr "N"
msgid "New"
msgstr "Ny"
-#: gtk-gui.c:1004
+#: gtk-gui.c:1008
msgid "New starting number"
msgstr "Nytt startnummer"
@@ -1140,8 +1128,7 @@ msgstr "Nytt startnummer"
msgid "Next DC"
msgstr "Nästa dykdator"
-#: gtk-gui.c:1274
-#: gtk-gui.c:1999
+#: gtk-gui.c:1274 gtk-gui.c:1999
msgid "Nickname"
msgstr "Enhetsnamn"
@@ -1149,9 +1136,7 @@ msgstr "Enhetsnamn"
msgid "No Tank Data"
msgstr "Ingen flaskinformation"
-#: info.c:611
-#: info.c:725
-#: info.c:1161
+#: info.c:629 info.c:823 info.c:1259
msgid "Notes"
msgstr "Anteckningar"
@@ -1163,10 +1148,7 @@ msgstr "nov"
msgid "OLF"
msgstr "OLF"
-#: divelist.c:1426
-#: gtk-gui.c:722
-#: print.c:363
-#: statistics.c:852
+#: divelist.c:1430 gtk-gui.c:726 print.c:349 statistics.c:855
#, c-format
msgid "OTU"
msgstr "OTU"
@@ -1175,7 +1157,7 @@ msgstr "OTU"
msgid "Oct"
msgstr "okt"
-#: libdivecomputer.c:769
+#: libdivecomputer.c:770
msgid "Odd pthread error return"
msgstr "Konstig felreturn from pthread"
@@ -1183,7 +1165,7 @@ msgstr "Konstig felreturn from pthread"
msgid "Ok to delete the selected entry?"
msgstr "Ok att radera?"
-#: gtk-gui.c:268
+#: gtk-gui.c:272
msgid "Open File"
msgstr "Öppna fil"
@@ -1191,7 +1173,7 @@ msgstr "Öppna fil"
msgid "Open..."
msgstr "Öppna..."
-#: print.c:178
+#: print.c:166
#, c-format
msgid "Oxygen"
msgstr "Syre"
@@ -1212,11 +1194,11 @@ msgstr "Varning: uppstigning / PO2"
msgid "PO2 Green Warning"
msgstr "Varning: grön PO2"
-#: gtk-gui.c:635
+#: gtk-gui.c:639
msgid "PSI"
msgstr "psi"
-#: info.c:686
+#: info.c:786
msgid "Pick on map"
msgstr "Välj från karta"
@@ -1224,7 +1206,7 @@ msgstr "Välj från karta"
msgid "Planner"
msgstr "Planerare"
-#: gtk-gui.c:606
+#: gtk-gui.c:610
msgid "Preferences"
msgstr "Inställningar"
@@ -1232,12 +1214,11 @@ msgstr "Inställningar"
msgid "Preferences..."
msgstr "Inställningar..."
-#: equipment.c:938
-#: equipment.c:944
+#: equipment.c:938 equipment.c:944
msgid "Pressure"
msgstr "Tryck"
-#: gtk-gui.c:633
+#: gtk-gui.c:637
msgid "Pressure:"
msgstr "Tryck:"
@@ -1245,15 +1226,15 @@ msgstr "Tryck:"
msgid "Prev DC"
msgstr "Föregående dykdator"
-#: print.c:930
+#: print.c:947
msgid "Print only selected dives"
msgstr "Skriv ut valda dyk"
-#: print.c:925
+#: print.c:942
msgid "Print selection"
msgstr "Skriv ut valda dyk"
-#: print.c:897
+#: print.c:914
msgid "Print type"
msgstr "Utskriftstyp"
@@ -1265,7 +1246,7 @@ msgstr "Skriv ut..."
msgid "Profile"
msgstr "Profil"
-#: gtk-gui.c:732
+#: gtk-gui.c:736
msgid "Profile Settings"
msgstr "Profilinställningar"
@@ -1281,8 +1262,7 @@ msgstr "Varning: gastid"
msgid "RGT Warning"
msgstr "Varning: gastid"
-#: info.c:705
-#: info.c:1158
+#: info.c:803 info.c:1256
msgid "Rating"
msgstr "Rankning"
@@ -1291,20 +1271,19 @@ msgstr "Rankning"
msgid "Reading %s %s"
msgstr "Läser %s %s"
-#: divelist.c:2051
-#: divelist.c:2395
+#: divelist.c:2080 divelist.c:2424
msgid "Remove Trip"
msgstr "Radera resa"
-#: divelist.c:2470
+#: divelist.c:2503
msgid "Remove dive from trip"
msgstr "Ta bort dyk från resa"
-#: divelist.c:2468
+#: divelist.c:2501
msgid "Remove selected dives from trip"
msgstr "Ta bort valda dyk från resa"
-#: gtk-gui.c:995
+#: gtk-gui.c:999
msgid "Renumber"
msgstr "Uppdatera numrering"
@@ -1316,24 +1295,20 @@ msgstr "Uppdatera numrering..."
msgid "Retry"
msgstr "Försök igen"
-#: info.c:628
+#: info.c:654
msgid "S"
msgstr "S"
-#: divelist.c:1425
-#: gtk-gui.c:674
-#: print.c:410
-#: statistics.c:182
-#: statistics.c:851
+#: divelist.c:1429 gtk-gui.c:678 print.c:398 statistics.c:175 statistics.c:854
#, c-format
msgid "SAC"
msgstr "SAC"
-#: planner.c:1236
+#: planner.c:1258
msgid "SAC during decostop"
msgstr "SAC under dekostopp"
-#: planner.c:1235
+#: planner.c:1257
msgid "SAC during dive"
msgstr "SAC under dyk"
@@ -1353,23 +1328,28 @@ msgstr "lör"
msgid "Save As..."
msgstr "Spara som..."
-#: gtk-gui.c:198
+#: gtk-gui.c:202
msgid "Save Changes?"
msgstr "Spara ändringar?"
-#: gtk-gui.c:135
+#: divelist.c:1633 gtk-gui.c:139
msgid "Save File As"
msgstr "Spara fil som"
+#: divelist.c:2441
+#, fuzzy
+msgid "Save as"
+msgstr "Spara som..."
+
#: gtk-gui.c:1361
msgid "Save..."
msgstr "Spara..."
-#: planner.c:1140
+#: planner.c:1150
msgid "Segment Time"
msgstr "Segment-tid"
-#: gtk-gui.c:944
+#: gtk-gui.c:948
msgid "Select Events"
msgstr "Välj händelser"
@@ -1389,60 +1369,58 @@ msgstr ""
"Kunde inte skriva filen req.txt\n"
"Är Uemis Zurich ordentligt ansluten?"
-#: statistics.c:188
+#: statistics.c:181
msgctxt "Duration"
msgid "Shortest"
msgstr "Kortaste"
-#: statistics.c:791
+#: statistics.c:794
msgid "Shortest Dive"
msgstr "Kortaste dyk"
-#: gtk-gui.c:653
-#: gtk-gui.c:716
+#: gtk-gui.c:657 gtk-gui.c:720
msgid "Show Columns"
msgstr "Visa kolumner"
-#: gtk-gui.c:812
+#: gtk-gui.c:816
msgid "Show EAD, END, EADD"
msgstr "Visa EAD, END, EADD"
-#: gtk-gui.c:795
+#: gtk-gui.c:799
msgid "Show MOD"
msgstr "Visa MOD"
-#: gtk-gui.c:828
+#: gtk-gui.c:832
msgid "Show calculated ceiling"
msgstr "Visa beräknad tak-information"
-#: gtk-gui.c:820
+#: gtk-gui.c:824
msgid "Show dc reported ceiling in red"
msgstr "Visa takinformationen i rött"
-#: divelist.c:2441
+#: divelist.c:2474
msgid "Show in map"
msgstr "Visa på kartan"
-#: gtk-gui.c:778
+#: gtk-gui.c:782
msgid "Show pHe graph"
msgstr "Visa pHe graf"
-#: gtk-gui.c:759
+#: gtk-gui.c:763
#, c-format
msgid "Show pN%s graph"
msgstr "Visa pN%s graf"
-#: gtk-gui.c:740
+#: gtk-gui.c:744
#, c-format
msgid "Show pO%s graph"
msgstr "Visa pO%s graph"
-#: planner.c:191
+#: planner.c:192
msgid "Simulated Dive"
msgstr "Simulerat dyk"
-#: equipment.c:935
-#: equipment.c:1453
+#: equipment.c:935 equipment.c:1453
msgid "Size"
msgstr "Storlek"
@@ -1454,20 +1432,19 @@ msgstr "Alarm: uppstigningshastighet"
msgid "Speed Warning"
msgstr "Varning: uppstigningshastighet"
-#: equipment.c:946
-#: equipment.c:1455
+#: equipment.c:946 equipment.c:1455
msgid "Start"
msgstr "Start"
-#: uemis-downloader.c:774
+#: uemis-downloader.c:782
msgid "Start download"
msgstr "Starta nedladdningen"
-#: statistics.c:769
+#: statistics.c:772
msgid "Statistics"
msgstr "Statistik"
-#: statistics.c:705
+#: statistics.c:708
#, c-format
msgid "Statistics %s"
msgstr "Statistik %s"
@@ -1480,26 +1457,12 @@ msgstr "Statistik"
msgid "Status"
msgstr "Status"
-#: planner.c:511
+#: planner.c:518
#, c-format
msgid "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s\n"
-#: planner.c:461
-#, c-format
-msgid ""
-"Subsurface dive plan\n"
-"based on GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-msgstr ""
-"Subsurface dykplan\n"
-"baserad på GFlow = %.0f and GFhigh = %.0f\n"
-"\n"
-
-#: divelist.c:1422
-#: gtk-gui.c:684
-#: info.c:706
-#: info.c:1159
+#: divelist.c:1426 gtk-gui.c:688 info.c:804 info.c:1257
msgid "Suit"
msgstr "Dräkt"
@@ -1508,20 +1471,20 @@ msgstr "Dräkt"
msgid "Sun"
msgstr "sön"
-#: statistics.c:829
+#: statistics.c:832
msgid "Surf Intv"
msgstr "Ytintervall"
-#: planner.c:1220
+#: planner.c:1242
msgid "Surface Pressure (mbar)"
msgstr "Lufttryck på ytan (mbar)"
-#: planner.c:521
+#: planner.c:528
#, c-format
msgid "Switch gas to %s\n"
msgstr "Byt till gas %s\n"
-#: print.c:911
+#: print.c:928
msgid "Table print"
msgstr "Tabellutskrift"
@@ -1533,19 +1496,19 @@ msgstr "Tankbyte rekommenderat"
msgid "Tank Pressure Info"
msgstr "Info: flasktryck"
-#: gtk-gui.c:714
+#: gtk-gui.c:718
msgid "Tec Settings"
msgstr "Tekniska inställningar"
-#: gtk-gui.c:659
+#: gtk-gui.c:663
msgid "Temp"
msgstr "Temp"
-#: statistics.c:182
+#: statistics.c:175
msgid "Temperature"
msgstr "Temperatur"
-#: gtk-gui.c:643
+#: gtk-gui.c:647
msgid "Temperature:"
msgstr "Temperatur:"
@@ -1557,8 +1520,7 @@ msgstr "Alla"
msgid "Thu"
msgstr "tor"
-#: info.c:1016
-#: print.c:510
+#: info.c:1114 print.c:501
msgid "Time"
msgstr "Tid"
@@ -1572,21 +1534,21 @@ msgstr "Dubbelklicka på dyklistan för att ändra dykinformation"
msgid "Toggle Zoom"
msgstr "Zoom av/på"
-#: statistics.c:186
+#: statistics.c:179
msgctxt "Duration"
msgid "Total"
msgstr "Total"
-#: statistics.c:788
+#: statistics.c:791
msgid "Total Time"
msgstr "Total tid"
-#: print.c:336
+#: print.c:321
#, c-format
msgid "Total Weight:"
msgstr "Total vikt:"
-#: planner.c:502
+#: planner.c:509
#, c-format
msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
msgstr "Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %s\n"
@@ -1603,8 +1565,7 @@ msgstr[1] "Resa %1$s, %3$d %2$s, %4$d (%5$d dyk)"
msgid "Tue"
msgstr "tis"
-#: equipment.c:1452
-#: equipment.c:1480
+#: equipment.c:1452 equipment.c:1480
msgid "Type"
msgstr "Typ"
@@ -1628,25 +1589,25 @@ msgstr ""
"Återanslut dykdatorn och försök\n"
"igen"
-#: uemis-downloader.c:763
+#: uemis-downloader.c:771
msgid "Uemis init failed"
msgstr "Kunde inte läsa från Uemis"
-#: libdivecomputer.c:698
+#: libdivecomputer.c:699
msgid "Unable to create libdivecomputer context"
msgstr "Kan inte skapa libdivecomputer context"
-#: libdivecomputer.c:403
+#: libdivecomputer.c:404
#, c-format
msgid "Unable to create parser for %s %s"
msgstr "Kan inte skapa parser för %s %s"
-#: libdivecomputer.c:700
+#: libdivecomputer.c:701
#, c-format
msgid "Unable to open %s %s (%s)"
msgstr "Kunde inte öppna fil %s %s (%s)"
-#: gtk-gui.c:622
+#: gtk-gui.c:626
msgid "Units"
msgstr "Enheter"
@@ -1658,20 +1619,19 @@ msgstr "Användar ID"
msgid "View"
msgstr "Visa"
-#: info.c:711
-#: statistics.c:837
+#: info.c:809 statistics.c:840
msgid "Visibility"
msgstr "Synlighet"
-#: gtk-gui.c:638
+#: gtk-gui.c:642
msgid "Volume:"
msgstr "Volym:"
-#: info.c:629
+#: info.c:655
msgid "W"
msgstr "W"
-#: statistics.c:843
+#: statistics.c:846
msgid "Water Temp"
msgstr "Vattentemperatur"
@@ -1683,32 +1643,28 @@ msgstr "Webbtjänst"
msgid "Wed"
msgstr "ons"
-#: equipment.c:985
-#: equipment.c:1579
-#: gtk-gui.c:679
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:683
msgid "Weight"
msgstr "Vikt"
-#: equipment.c:1084
-#: print.c:304
+#: equipment.c:1084 print.c:289
#, c-format
msgid "Weight System"
msgstr "Viktsystem"
-#: gtk-gui.c:648
+#: gtk-gui.c:652
msgid "Weight:"
msgstr "Vikt:"
-#: gtk-gui.c:123
+#: gtk-gui.c:127
msgid "XML file"
msgstr "XML-fil"
-#: statistics.c:182
+#: statistics.c:175
msgid "Year"
msgstr "År"
-#: gtk-gui.c:1371
-#: statistics.c:390
+#: gtk-gui.c:1371 statistics.c:383
msgid "Yearly Statistics"
msgstr "Årsstatistik"
@@ -1725,7 +1681,7 @@ msgstr ""
"Subsurface kan namnge den nya dykdatorn så att du kan lätt skilja dem åt. Det förvalda namnet är modellen och enhetens ID som visas nedan.\n"
"Om du inte vill ge ett nytt namn åt datorn, tryck 'Avbryt'. Subsurface kommer att endast visa modellnamnet (vilket kan göra det svårt att skilja två dykdatorer av samma modell)."
-#: gtk-gui.c:208
+#: gtk-gui.c:212
msgid ""
"You have unsaved changes\n"
"Would you like to save those before closing the datafile?"
@@ -1733,8 +1689,7 @@ msgstr ""
"Du har ändringer som inte är sparade.\n"
"Vill du spara dem innan du stänger datafilen?"
-#: gtk-gui.c:211
-#: gtk-gui.c:214
+#: gtk-gui.c:215 gtk-gui.c:218
#, c-format
msgid ""
"You have unsaved changes to file: %s \n"
@@ -1743,10 +1698,7 @@ msgstr ""
"Du har ändringer som inte är sparade i %s.\n"
"Vill du spara dem innan du stänger datafilen?"
-#: divelist.c:544
-#: planner.c:74
-#: planner.c:725
-#: print.c:183
+#: divelist.c:544 planner.c:75 planner.c:732 planner.c:733 print.c:171
#: profile.c:399
#, c-format
msgid "air"
@@ -1792,8 +1744,7 @@ msgstr "ceiling (säkerhetsstopp)"
msgid "clip-on"
msgstr "clip-on"
-#: dive.c:91
-#: planner.c:890
+#: dive.c:91 planner.c:897
msgid "cuft"
msgstr "ft³"
@@ -1825,39 +1776,36 @@ msgstr "dyktid"
msgid "drysuit"
msgstr "torrdräkt"
-#: planner.c:727
+#: planner.c:734
msgid "ean"
msgstr "ean"
-#: statistics.c:678
+#: statistics.c:681
#, c-format
msgid "for all dives"
msgstr "för alla dyk"
-#: statistics.c:674
+#: statistics.c:677
#, c-format
msgid "for dive #%d"
msgstr "Dyk #%d "
-#: statistics.c:633
+#: statistics.c:636
#, c-format
msgid "for dives #"
msgstr "för dykningar #"
-#: statistics.c:676
+#: statistics.c:679
#, c-format
msgid "for selected dive"
msgstr "för valt dyk"
-#: statistics.c:640
+#: statistics.c:643
#, c-format
msgid "for selected dives"
msgstr "för utvalda dyk"
-#: dive.c:117
-#: divelist.c:1418
-#: info.c:1078
-#: planner.c:831
+#: dive.c:117 divelist.c:1422 info.c:1176 planner.c:838
msgid "ft"
msgstr "ft"
@@ -1865,8 +1813,7 @@ msgstr "ft"
msgid "full suit"
msgstr "fulldräkt"
-#: libdivecomputer.c:151
-#: libdivecomputer.c:154
+#: libdivecomputer.c:151 libdivecomputer.c:154
msgid "gaschange"
msgstr "gasbyte"
@@ -1886,9 +1833,7 @@ msgstr "okänt händelsenummer"
msgid "jacket"
msgstr "jacka"
-#: dive.c:141
-#: equipment.c:1004
-#: gtk-gui.c:649
+#: dive.c:141 equipment.c:1004 gtk-gui.c:653
msgid "kg"
msgstr "kg"
@@ -1896,10 +1841,7 @@ msgstr "kg"
msgid "l"
msgstr "l"
-#: dive.c:137
-#: divelist.c:1421
-#: equipment.c:1006
-#: gtk-gui.c:650
+#: dive.c:137 divelist.c:1425 equipment.c:1006 gtk-gui.c:654
msgid "lbs"
msgstr "pund"
@@ -1907,17 +1849,15 @@ msgstr "pund"
msgid "long john"
msgstr "Longjohn"
-#: dive.c:112
-#: info.c:1078
+#: dive.c:112 info.c:1176
msgid "m"
msgstr "m"
-#: gtk-gui.c:800
+#: gtk-gui.c:804
msgid "max ppO2"
msgstr "max ppO2"
-#: divelist.c:1427
-#: gtk-gui.c:727
+#: divelist.c:1431 gtk-gui.c:731
msgid "maxCNS"
msgstr "maxCNS"
@@ -1929,12 +1869,11 @@ msgstr "Maxdjup"
msgid "membrane"
msgstr "membran"
-#: divelist.c:1419
-#: planner.c:896
+#: divelist.c:1423 planner.c:903
msgid "min"
msgstr "Min"
-#: libdivecomputer.c:629
+#: libdivecomputer.c:630
#, c-format
msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
@@ -1943,7 +1882,7 @@ msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
msgid "more data dive id"
msgstr "mer data dive id"
-#: statistics.c:522
+#: statistics.c:515
#, c-format
msgid "more than %d days"
msgstr "mer än %d dagar"
@@ -1956,16 +1895,16 @@ msgstr "non stop tid"
msgid "none"
msgstr "inget"
-#: gtk-gui.c:783
+#: gtk-gui.c:787
msgid "pHe threshold"
msgstr "pHe tröskel"
-#: gtk-gui.c:765
+#: gtk-gui.c:769
#, c-format
msgid "pN%s threshold"
msgstr "pN%s tröskel"
-#: gtk-gui.c:746
+#: gtk-gui.c:750
#, c-format
msgid "pO%s threshold"
msgstr "pO%s tröskel"
@@ -2025,16 +1964,11 @@ msgstr ""
msgid "transmitter"
msgstr "sändare"
-#: equipment.c:1345
-#: equipment.c:1365
+#: equipment.c:1345 equipment.c:1365
msgid "unkn"
msgstr "okänd"
-#: libdivecomputer.c:152
-#: print.c:317
-#: statistics.c:563
-#: statistics.c:584
-#: uemis-downloader.c:133
+#: libdivecomputer.c:152 print.c:302 statistics.c:561 uemis-downloader.c:133
msgid "unknown"
msgstr "okänd"
@@ -2062,6 +1996,9 @@ msgstr "våtdräkt"
msgid "workload"
msgstr "arbetsbelastning"
+#~ msgid "1 dive per page"
+#~ msgstr "1 dyk per sida"
+
#~ msgid "About"
#~ msgstr "Om"