Updated PO files in preparation of 3.0 release

Translators, please start your engines... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
author: Dirk Hohndel <dirk@hohndel.org> 2013-02-01 18:08:13 +1100
committer: Dirk Hohndel <dirk@hohndel.org> 2013-02-01 18:08:13 +1100
commit: 08d4b43243a28e930447bbd15780438ab814b866 (patch)
tree: 9d0cc94ab39a3cc2f53f13cd0c21dceef5916eee /po
parent: 29e73be9f2958c8ae3c4eb9efe6d602e89e2c6ae (diff)
download: subsurface-08d4b43243a28e930447bbd15780438ab814b866.tar.gz
13 files changed, 13045 insertions, 4077 deletions
diff --git a/po/bg_BG.po b/po/bg_BG.po
index f8f7d6c3e..26facf711 100644
--- a/po/bg_BG.po
+++ b/po/bg_BG.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\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,562 +19,946 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Месец"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Моля изберете леководолазен компютър и устройство. "
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "№"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/мин"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/мин"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/мин"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, 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:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr "%1$s %3$d %2$s %4$d   %5$dh%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s, %3$d %2$s, %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr "%1$s, %3$d %2$s, %4$d %5$2d:%6$02d"
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d мин"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dд %dч %dмин"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dч %dмин"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) или (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Редактирай гмуркания"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "За Subsurface"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Добави Гмуркане..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Добави гмуркане"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Добави в горно пътуване"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+# ППК = Повърхностно Потребление на Кислород
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Средна Темп."
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "Апр"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Авг"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Автоматично групиране"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Автоматично групиране на гмуркания в пътувания"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Средно"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Средно"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Средно"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Средно"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Средна Дълбочина"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Средно ППК"
 
 # ППК = Повърхностно Потребление на Кислород
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Средна Темп."
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Средно Време"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "Бара"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Партньор"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Целзии"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Моля Изберете XML Файл По Подразбиране"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Моля Изберете XML Файлове За Вмъкване"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Затвори"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Свиване на всички"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Създай ново пътуване"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "Кб.Фута"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Бут."
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Бутилка"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Бутилки"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/мин"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Дата"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Дата и Час"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Дата:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Дек"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "XML Файл По Подразибране"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Изтрий"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Изтрий Гмуркане"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Изтрий гмуркане"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Изтрий гмуркания"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Дълбочина"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Дълбочина (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Надминат Лимит На Дълбочина"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Дълбочина:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Име на устройство"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Гмуркане №%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
+#, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Гмуркане №%d: %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Леководолазен Компютър"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Информация"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Бележки"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Време"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Тревога: Време за Гмуркане"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Времева Информация за Гмуркане"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Леководолазен Компютър"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Грешка при вход на данни"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Информяция за гмуркане"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Бележки"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Водач"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Гмуркане №"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Шрифт за Списъка на Гмуркания"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Водач"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Гмуркания"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Местоположение"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Изтегли от Леководолазен Компютър"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Изтегли от Леководолазен Компютър..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Изтегли от Леководолазен Компютър"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Изтегли от Леководолазен Компютър..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Продълж. (мин.)"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Продълж. (мин.)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Редактирай"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Име на устройство"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Редактиране на информация за пътуване"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Редактиране на обобщение за пътуване"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Редактиране на гмуркане"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Редактиране на гмуркане"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Редактирай гмуркания"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Редактиране на гмуркания"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Редактиране на обобщение за пътуване"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Включване / Изключване на Събития"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Край"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, 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."
+msgstr ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Екипировка"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Грешка при рaзряд на стойности"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Грешка при разряд на дата и час"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Грешка при рaзряд на време за гмуркане"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Грешка при рaзряд на газ микс"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Грешка при рaзряд на газ микс брой"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Грешка при рaзряд на максимална дълбочина"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Грешка при рaзряд на стойности"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Грешка при регистриране на направление за отменяне"
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Грешка при регистриране на данни"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Грешка при регистриране на направление за събития"
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Събитие: systime=%<PRId64>, devtime=%u\n"
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Събитие: изчаквание на действие от потребителя"
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Разшири всички"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Фаренхайт"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Не могат да бъдат отворени %i файла"
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Не може да бъде напревен разбор на '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Не може да бъде напревен разбор на '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Не може да бъде прочетен '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Не може да бъде прочетен '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Фев"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "Фута"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Файл"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Филтър"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Пет"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Използван Газ"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Газ Микс"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Помощ"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Вмъкване на XML файл(ове)..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Информация"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Ян"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Юли"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Юни"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Линус Торвалдс, Дирк Хондел и други, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Списък"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "Литра"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Местоположение"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Регистър"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Най-дълго"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Най-дълго Гмуркане"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Тревога: Слаба Батерия"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Внимание: Слаба Батерия"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Март"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Маркер"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Главен"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Внимание: Максимално Време на Сигнал за Декомпресия"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Макс. Дълбочина"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Макс. ППК"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Макс. Темп."
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -585,271 +969,342 @@ msgstr ""
 "Продължителност: %d мин\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Макс. Налягане"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Май"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Изтрий гмуркания"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Слей пътуване с горно пътуване"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Слей пътуване с долно пътуване"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "Метра"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Мин. Дълбочина"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Мин. ППК"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Мин. Темп."
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Общи Настройки"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Пон"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Мултиплатформен, гмуркачески регистър-софтуер написан на C"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Нов"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Нов стартов номер"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Име на устройство"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Няма Информация за Резервоар"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Бележки"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Нов"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
 # АЗПК = Апарат за Поносимост на Кислород
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "АЗПК"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Окт"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Грешка върната от phread"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Отвори Файл"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Отвори..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO2"
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Тревога: Покачване на Парциално О2 Налягане"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Внимание: Покачване на Парциално О2 Налягане"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Внимание: Парциално О2 Налягане в Зелената Зона"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "PSI"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Настройки"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Настройки..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Налягане"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Налягане:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Красив печат"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Напечатай само избраните гмуркания"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Напечатай селекцията"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Тип на печата"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Напечатай..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Профил"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Профил"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Изход"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Тревога: Оставащо Газ-Време"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Внимание: Оставащо Газ-Време"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Оценка"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Четене на гмуркане %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Изтрий Пътуване"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Изтрий гмуркане от пътуване"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Изтрий избраните гмуркания от пътуване"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Преномерирай"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Преномерирай..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Опитай пак"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "ППК"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Добави гмуркане"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE файл"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Нарушение на Безопасно Спиране"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Съб"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Запиши като..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Запиши Промените?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Запиши Файл Като?"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Запиши..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Средно Време"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Избери Събития"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Избери Събития..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Сеп"
 
@@ -861,126 +1316,222 @@ msgstr ""
 "Кратък запис в req.txt файл\n"
 "Uemis Zurich включен ли е правилно?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Най-къс"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Най-кратко Гмуркане"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Покажи Колони"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Изтрий Гмуркане"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Големина"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Тревога: Скорост"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Внимание: Скорост"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Старт"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Статистика"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Статистика"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Статистики"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Статистики"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Водолазен Костюм"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "Нед"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Време на Повърхността"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Печат на таблица"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Предложение за Смяна на Резорвоар"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Информация: Налагане на Резервоар"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Температура"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Температура:"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Комбиниран"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Чет"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Време"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Превключване на Зуум"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Общо Време"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Общо Време"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Тегло:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Пътуване: %1$s, %3$d %2$s, %4$d (%5$d Гмуркане)"
 msgstr[1] "Пътуване: %1$s, %3$d %2$s, %4$d (%5$d Гмуркания)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Вт"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Тип"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Файловата система е почти пълна\n"
 "Излючете/Свържете на ново леководолазния компютър\n"
@@ -996,68 +1547,98 @@ msgstr ""
 "Излючете/Свържете на ново леководолазния компютър\n"
 "и опитайте пак"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Uemis не може да бъде зареден"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "Не може да бъде създаден libdivecomputer контекст"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr "Не може да бъде създаден разряд за %s %s"
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
+#, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Не може да бъдe отворен %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Единици"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Изглед"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Обем:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Темп. на Водата"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Ср"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Тежест"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Система за тежест"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Тегло:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML файл"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Година"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Годишни статистики"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1065,7 +1646,7 @@ msgstr ""
 "Имате незаписани промени.\n"
 "Желаете ли да ги запишете преди затваряне на файла?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1074,196 +1655,314 @@ msgstr ""
 "Имате незаписани промени във файла %s.\n"
 "Желаете ли да ги запишете преди затваряне на файла?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "въздух"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "време за въздух"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "глезен"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "покачване"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "нагръбна"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "бара"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "колан"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "бележка"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "таван"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "таван (безопасен стоп)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "щипка"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "кб.фута"
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "декомпресия"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "дълбочина на спиране"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "дълбочина на спиране"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "време за гмуркане"
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Ян"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Гмуркане №%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Напечатай само избраните гмуркания"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Напечатай само избраните гмуркания"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "фута"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "смяна на газ"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "посока"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "вградена"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "грешен номер на събитие"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "кг"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "л"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "паунда"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "м"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "Макс. Дълбочина"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "мин"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "повече от %d дни"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "повече от %d дни"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "няма"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "паскала"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr "rbt"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr "rgbm"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "безопасен стоп"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "безопасен стоп (задължителен)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "безопасен стоп (свободен)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "повърхност"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "внимание: ниво на тъканта"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr "Lubomir I. Ivanov"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "предавател"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "неизв."
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "неизвестно"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "неопределен"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "нарушение"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "Тегло"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "натовареност"
 
 #~ msgid "About"
 #~ msgstr "Информация"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Автоматично групиране на гмуркания в пътувания"
+
+#~ msgid "Delete"
+#~ msgstr "Изтрий"
+
 #, fuzzy
 #~ msgctxt "Depth"
 #~ msgid ""
@@ -1282,6 +1981,9 @@ msgstr "натовареност"
 #~ "Продължителност\n"
 #~ "Тотално"
 
+#~ msgid "Pretty print"
+#~ msgstr "Красив печат"
+
 #, fuzzy
 #~ msgctxt "SAC"
 #~ msgid ""
@@ -1307,3 +2009,6 @@ msgstr "натовареност"
 #~ msgstr ""
 #~ "Температура\n"
 #~ "Средна"
+
+#~ msgid "deco"
+#~ msgstr "декомпресия"
diff --git a/po/de_CH.po b/po/de_CH.po
index 226fc32ac..edeead72c 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-10-22 17:37+0100\n"
 "Last-Translator: Martin Gysel <me@bearsh.org>\n"
 "Language-Team: German\n"
@@ -19,564 +19,946 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Monat"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Bitte Tauchcomputer und Gerät auswählen. "
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "#"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr "%1$s%2$s %4$d. %3$s %5$d   %6$d:%7$02d"
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d   %5$dh%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dt %dst %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dst %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) oder (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Tauchgänge bearbeiten"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "Info zu Subsurface"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Tauchgang hinzufügen..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Tauchgang hinzufügen"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Zur obigen Reise hinzufügen"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Durchschn. Temp"
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "Apr"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Automatisch gruppieren"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Automatisch die Tauchgänge gruppieren"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Durchschn. Tiefe"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Ø SAC"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Durchschn. Temp"
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Duchschn. Dauer"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Partner"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Standard XML Datei auswählen"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr ""
 "Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werden "
 "sollen"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Schliessen"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Alle einfalten"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Neue Reise darüber einfügen"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Tank"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Tank"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Tanks"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Datum und Zeit"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Dez"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Standard XML Datei"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Löschen"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Tauchgang löschen"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Tauchgang löschen"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Tauchgänge löschen"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Tiefe"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Tiefe (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Tiefenlimit überschritten"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Tiefe:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Gerätename"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
 msgstr "Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d"
 
-#: info.c:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Tauchgang #%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Tauchgang Nr. %d: %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Tauchcomputer"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Informationen"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Notizen"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Dauer"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Alarm: Tauchgangsdauer"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Info: Tauchgangsdauer"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Tauchcomputer"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Fehler beim Importieren der Daten des Tauchgangs"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Notizen zum Tauchgang"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Notizen"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Dive guide"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Tauchgang Nr."
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Schriftart für Tauchliste"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Diveguide"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Tauchgänge"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Ort"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Von Tauchcomputer "
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Von Tauchcomputer laden..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Von Tauchcomputer "
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Von Tauchcomputer laden..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Dauer"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Dauer (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Gerätename"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Reisen-Informationen bearbeiten"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Reisen-Übersicht bearbeiten"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Tauchgang bearbeiten"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Tauchgang bearbeiten"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Tauchgänge bearbeiten"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Mehrere Tauchgänge bearbeiten"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Reisen-Übersicht bearbeiten"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Ereignisse Ein-/Ausblenden"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Ende"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, fuzzy
+msgid "Ending Depth"
+msgstr "Min. Tiefe"
+
+#: 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 ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Fehler beim Auswerten der Samples"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Fehler beim Analysieren des Datums"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Fehler beim Analysieren der Dauer"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Fehler beim Analysieren der Gas Informationen"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Fehler beim Analysieren der Gas Informationen"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Fehler beim Analysieren der maximalen Tiefe"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Fehler beim Auswerten der Samples"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Fehler bei der Registrierung der Abbruchbehandlung"
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Fehler beim Registrieren der Daten"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Fehler beim Registrieren der Ereignisbehandlung"
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Ereignis: systime=%<PRId64>, devtime=%u\n"
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Ereignis: warte auf Benutzer Aktion"
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Alle ausfalten"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Fehler beim Öffnen von %i Dateien."
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Fehler beim Analysieren von '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Fehler beim Analysieren von '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Fehler beim Lesen von '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "Fuss"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Datei"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filter"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Fr"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Gasverbrauch"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Gasmischung"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Hilfe"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "XML Datei(en) einlesen..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Informationen"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Jan"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "Liter"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Ort"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Max."
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Längster Tauchgang"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Alarm: Batterie schwach"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Warnung: Batterie schwach"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Mär"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Markierung"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Guide"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Warnung: Maximale Deco Zeit"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Max. Tiefe"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Max. SAC"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Max. Temp."
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -587,270 +969,341 @@ msgstr ""
 "Dauer: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Max. Druck"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Max."
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Mai"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Tauchgänge löschen"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Reise mit der darüber verbinden"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Reise mit der darunter verbinden"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "Meter"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Min. Tiefe"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Min. SAC"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Min. Temp."
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Min."
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Verschiedene Optionen"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Mo"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Multi-Platform Tauchprogram in C"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Neu"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Neue erste Nummer"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Gerätename"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Keine Tank Informationen"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Notizen"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Nov"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Okt"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Unbekannter pthread Fehlercode"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO₂"
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Alarm: Aufstieg / PO₂"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Warnung: Aufstieg / PO₂"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Warnung: PO₂ Grün"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Druck"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Druck:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Schön drucken"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Nur ausgewählte Tauchgänge drucken"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Auswahl drucken"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Art des Ausdrucks"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Drucken..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profil"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Beenden"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Alarm: verbleibende Gas-Zeit"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Warnung: verbleibende Gas-Zeit"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Bewertung"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Lese Tauchgang %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Reise entfernen"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Tauchgang aus Reise entfernen"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Neu nummerieren"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Neu nummerieren..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "SAC"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Tauchgang hinzufügen"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE Datei"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Verletzung des Sicherheitsstops"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Sa"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Änderungen speichern?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Datei speichern unter"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Speichern..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Duchschn. Dauer"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Ereignisse auswählen"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Ereignisse auswählen..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Sep"
 
@@ -862,126 +1315,222 @@ msgstr ""
 "Unvollständiger Schreibvorgang der req.txt Datei\n"
 "Ist der Uemis Zurich korrekt verbunden?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Min."
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Kürzester Tauchgang"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Spalten anzeigen"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Tauchgang löschen"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Grösse"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: Geschwindigkeit"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Warnung: Geschwindigkeit"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Start"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Statistiken"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Statistiken"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Statistiken"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Anzug"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "So"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Oberflächenpause"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Tabellenausdruck"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Tankwechsel Vorschlag"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Info: Tankdruck"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temperatur"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Drei"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Do"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Zeit"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Zoom ein-/ausschalten"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Gesamt"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Gesamtzeit"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Gewicht:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgang)"
 msgstr[1] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Di"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Typ"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Dateisystem beinahe voll\n"
 "Bitte den Tauchcomputer ausstecken und wieder einstecken\n"
@@ -997,69 +1546,98 @@ msgstr ""
 "Bitte den Tauchcomputer ausstecken und wieder einstecken\n"
 "und erneut versuchen"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Uemis Initialisierung fehlgeschlagen"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "Fehler beim Erzeugen des libdivecomputer Contexts"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, 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:392
+#: libdivecomputer.c:700
 #, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Fehler beim Öffnen von %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Einheiten"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Ansicht"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Wassertemperatur"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Mi"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Gewicht"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Gewicht"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML Datei"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Jahr"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Jährliche Statistiken"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1067,7 +1645,7 @@ msgstr ""
 "Nicht alle Änderungen wurden gespeichert.\n"
 "Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1076,198 +1654,316 @@ msgstr ""
 "Nicht alle Änderungen in der Datei %s wurden gespeichert.\n"
 "Sollen Änderungen vor dem Schliessen der Datei gespeichert werden?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "Luft"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "verbleibende Atemzeit"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "Fuss"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "Aufstieg"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "Rückenplatten-Gewicht"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "Gürtel"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "Markierung"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "Minimaltiefe"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "Minimaltiefe (Sicherheitsstopp)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "cuft"
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "Deko"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "Tiefenstopp"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "Tiefenstopp"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "Dauer"
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Jan"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Tauchgang #%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Nur ausgewählte Tauchgänge drucken"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Nur ausgewählte Tauchgänge drucken"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "Flaschenwechsel"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "Richtung"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integriert"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "ungültige Ereignisnummer"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "US Pfund"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "Max. Tiefe"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "mehr als %d Tage"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "mehr als %d Tage"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "keine"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "Pascal"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr "rbt"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr "rgbm"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "Sicherheitsstopp"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "Sicherheitsstopp (verpflichtend)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "Sicherheitsstopp (freiwillig)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "Oberfläche"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Warnung auf Gewebe-Ebene"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr ""
 "Dirk Hohndel\n"
 "Martin Gysel"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "Sender"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "unbk"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "unbekannt"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "nicht angegeben"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "Verletzung"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "Gewicht"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "Arbeit"
 
 #~ msgid "About"
 #~ msgstr "Info"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Automatisch die Tauchgänge gruppieren"
+
+#~ msgid "Delete"
+#~ msgstr "Löschen"
+
 #~ msgctxt "Depth"
 #~ msgid ""
 #~ "Depth\n"
@@ -1284,6 +1980,9 @@ msgstr "Arbeit"
 #~ "Dauer\n"
 #~ "Gesamt"
 
+#~ msgid "Pretty print"
+#~ msgstr "Schön drucken"
+
 #~ msgctxt "SAC"
 #~ msgid ""
 #~ "SAC\n"
@@ -1307,3 +2006,6 @@ msgstr "Arbeit"
 #~ msgstr ""
 #~ "Temperatur\n"
 #~ "Ø"
+
+#~ msgid "deco"
+#~ msgstr "Deko"
diff --git a/po/de_DE.po b/po/de_DE.po
index 71cbe6fba..66ca7269f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-10-10 16:27+0900\n"
 "Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n"
 "Language-Team: German\n"
@@ -18,564 +18,946 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Monat"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Bitte Tauchcomputer und Gerät auswählen. "
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "Nr."
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr "%1$s%2$s %4$d. %3$s %5$d   %6$d:%7$02d"
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d   %5$dh%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dt %dst %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dst %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) oder (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Tauchgänge bearbeiten"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "Info zu Subsurface"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Tauchgang hinzufügen..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Tauchgang hinzufügen"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Zur obigen Reise hinzufügen"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Ø Temp"
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "Apr"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Automatisch gruppieren"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Automatisch die Tauchgänge gruppieren"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Ø Tiefe"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Ø AMV"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Ø Temp"
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Ø Dauer"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Partner"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Standard XML Datei auswählen"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr ""
 "Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werden "
 "sollen"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Schließen"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Alle einfalten"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Neue Reise darüber einfügen"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Flasche"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Flasche"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Flaschen"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Datum und Zeit"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Dez"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Standard XML Datei"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Löschen"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Tauchgang löschen"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Tauchgang löschen"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Tauchgänge löschen"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Tiefe"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Tiefe (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Tiefenbegrenzung überschritten"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Tiefe:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Gerätename"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d"
 msgstr "Tauchgang #%1$d - %2$s %4$02d.%3$02d.%5$04d um %6$d:%7$02d"
 
-#: info.c:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Tauchgang #%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Tauchgang Nr. %d: %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Tauchcomputer"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Informationen"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Notizen"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Dauer"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Alarm: Tauchgangsdauer"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Info: Tauchgangsdauer"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Tauchcomputer"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Fehler beim Importieren der Daten des Tauchgangs"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Notizen zum Tauchgang"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Notizen"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Tauchgruppenleiter"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Tauchgang Nr."
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Schriftart für Tauchliste"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Tauchgruppenleiter"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Tauchgänge"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Ort"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Von Tauchcomputer laden"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Von Tauchcomputer laden..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Von Tauchcomputer laden"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Von Tauchcomputer laden..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Dauer"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Dauer (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Gerätename"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Reisen-Informationen bearbeiten"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Reisen-Übersicht bearbeiten"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Tauchgang bearbeiten"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Tauchgang bearbeiten"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Tauchgänge bearbeiten"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Mehrere Tauchgänge bearbeiten"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Reisen-Übersicht bearbeiten"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Ereignisse Ein-/Ausblenden"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Ende"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, fuzzy
+msgid "Ending Depth"
+msgstr "Min. Tiefe"
+
+#: 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 ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Fehler beim Auswerten der Samples"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Fehler beim Analysieren des Datums"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Fehler beim Analysieren der Dauer"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Fehler beim Analysieren der Gas Informationen"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Fehler beim Analysieren der Gas Informationen"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Fehler beim Analysieren der maximalen Tiefe"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Fehler beim Auswerten der Samples"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Fehler bei der Registrierung der Abbruchbehandlung"
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Fehler beim Registrieren der Daten"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Fehler beim Registrieren der Ereignisbehandlung"
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Ereignis: systime=%<PRId64>, devtime=%u\n"
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Ereignis: warte auf Benutzer Aktion"
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Alle ausfalten"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Fehler beim Öffnen von %i Dateien"
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Fehler beim Analysieren von '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Fehler beim Analysieren von '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Fehler beim Lesen von '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "Fuß"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Datei"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filter"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Fr"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Gasverbrauch"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Gasmischung"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Hilfe"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "XML Datei(en) einlesen..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Informatinen"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Jan"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel und andere, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "Liter"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Ort"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Max."
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Längster Tauchgang"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Alarm: Batterie schwach"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Warnung: Batterie schwach"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Mär"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Markierung"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Leiter"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Warnung: Maximale Deco Zeit"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Max. Tiefe"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Max. AMV"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Max. Temp."
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -586,270 +968,341 @@ msgstr ""
 "Dauer: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Max.Druck"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Max."
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Mai"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Tauchgänge löschen"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Reise mit der darüber verbinden"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Reise mit der darunter verbinden"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "Meter"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Min. Tiefe"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Min. AMV"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Min. Temp."
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Min."
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Verschiedene Optionen"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Mo"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Multi-Platform Tauchprogram in C"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Neu"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Neue erste Nummer"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Gerätename"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Keine Flaschen Informationen"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Notizen"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Nov"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Okt"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Unbekannter pthread Fehlercode"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO2"
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Alarm: Aufstieg / PO2"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Warnung: Aufstieg / PO2"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Warnung: PO2 Grün"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Druck"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Druck:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Schön drucken"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Nur ausgewählte Tauchgänge drucken"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Auswahl drucken"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Art des Ausdrucks"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Drucken..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profil"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Beenden"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Alarm: verbleibende Gas-Zeit"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Warnung: verbleibende Gas-Zeit"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Bewertung"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Lese Tauchgang %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Reise entfernen"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Tauchgang aus Reise entfernen"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Ausgewählte Tauchgänge aus Reise entfernen"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Neu nummerieren"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Neu nummerieren..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "AMV"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Tauchgang hinzufügen"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE Datei"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Verletzung des Sicherheitsstops"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Sa"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Änderungen speichern?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Datei speichern unter"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Speichern..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Ø Dauer"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Ereignisse auswählen"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Ereignisse auswählen..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Sep"
 
@@ -861,126 +1314,222 @@ msgstr ""
 "Unvollständiger Schreibvorgang der req.txt Datei\n"
 "Ist der Uemis Zurich korrekt verbunden?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Min."
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Kürzester Tauchgang"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Spalten anzeigen"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Tauchgang löschen"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Größe"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: Geschwindigkeit"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Warnung: Geschwindigkeit"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Start"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Statistiken"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Statistiken"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Statistiken"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Anzug"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "So"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Oberflächenpause"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Tabellenausdruck"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Flaschenwechsel Vorschlag"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Info: Flaschendruck"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temperatur"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Drei"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Do"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Zeit"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Zoom ein-/ausschalten"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Gesamt"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Gesamtzeit"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Gewicht:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgang)"
 msgstr[1] "Reise ab %1$s, %3$d. %2$s %4$d (%5$d Tauchgänge)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Di"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Typ"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Dateisystem beinahe voll\n"
 "Bitte den Tauchcomputer ausstecken und wieder einstecken\n"
@@ -996,69 +1545,98 @@ msgstr ""
 "Bitte den Tauchcomputer ausstecken und wieder einstecken\n"
 "und erneut versuchen"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Uemis Initialisierung fehlgeschlagen"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "Fehler beim Erzeugen des libdivecomputer Contexts"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, 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:392
+#: libdivecomputer.c:700
 #, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Fehler beim Öffnen von %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Einheiten"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Ansicht"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Wassertemperatur"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Mi"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Gewicht"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Gewicht"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML Datei"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Jahr"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Jährliche Statistiken"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1066,7 +1644,7 @@ msgstr ""
 "Nicht alle Änderungen wurden gespeichert.\n"
 "Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1075,196 +1653,314 @@ msgstr ""
 "Nicht alle Änderungen in der Dati %s wurden gespeichert.\n"
 "Sollen Änderungen vor dem Schließen der Datei gespeichert werden?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "Luft"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "verbleibende Atemzeit"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "Fuß"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "Aufstieg"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "Rückenplatten-Gewicht"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "Gürtel"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "Markierung"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "Minimaltiefe"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "Minimaltiefe (Sicherheitsstopp)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "cu.ft."
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "Deko"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "tiefer Stopp"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "tiefer Stopp"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "Dauer"
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Jan"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Tauchgang #%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Nur ausgewählte Tauchgänge drucken"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Nur ausgewählte Tauchgänge drucken"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "Flaschenwechsel"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "Richtung"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integriert"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "ungültige Ereignisnummer"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "US Pfund"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "Max. Tiefe"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "mehr als %d Tage"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "mehr als %d Tage"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "keine"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "Pa"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr "rbt"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr "rgbm"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "Sicherheitsstopp"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "Sicherheitsstopp (verpflichtend)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "Sicherheitsstopp (freiwillig)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "Oberfläche"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Warnung auf Gewebe-Ebene"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr "Dirk Hohndel"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "Sender"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "unbk"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "unbekannt"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "nicht angegeben"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "Verletzung"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "Gewicht"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "Arbeit"
 
 #~ msgid "About"
 #~ msgstr "Info"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Automatisch die Tauchgänge gruppieren"
+
+#~ msgid "Delete"
+#~ msgstr "Löschen"
+
 #~ msgctxt "Depth"
 #~ msgid ""
 #~ "Depth\n"
@@ -1281,6 +1977,9 @@ msgstr "Arbeit"
 #~ "Dauer\n"
 #~ "Gesamt"
 
+#~ msgid "Pretty print"
+#~ msgstr "Schön drucken"
+
 #~ msgctxt "SAC"
 #~ msgid ""
 #~ "SAC\n"
@@ -1304,3 +2003,6 @@ msgstr "Arbeit"
 #~ msgstr ""
 #~ "Temperatur\n"
 #~ "Ø"
+
+#~ msgid "deco"
+#~ msgstr "Deko"
diff --git a/po/es_ES.po b/po/es_ES.po
index c3d49632d..0af3f3409 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-10-22 07:55-0300\n"
 "Last-Translator: Sergio Schvezov <sergiusens@ieee.org>\n"
 "Language-Team: Spanish\n"
@@ -19,562 +19,944 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr "> Mes"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Por favor, seleccione el ordenador de buceo y el dispositivo."
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "#"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr ""
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr ""
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr ""
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr ""
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d minutos"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd, %dh %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) o (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Editar inmersiones"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "Sobre Subsurface"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Añadir inmersión ..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Añadir inmersión"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Añadir al viaje anterior"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Temp media"
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "Abr"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Auto Agrupar"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Automáticamente agrupar las inmersiones en viajes"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Promedio"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Profundidad media"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "SAC medio"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Temp media"
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Media de tiempo"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "Bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Compañero"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Seleccionar archivo XML predeterminado"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Elegir archivos XML para importar en archivo de datos actual"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Cerrar"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Contraer todo"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Crear nuevo viaje por encima"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "pie^3"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Bot"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Botella"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Botellas"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Fecha"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Fecha:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Dic"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Archivo XML por defecto"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Eliminar"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Eliminar inmersión"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Eliminar inmersión"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Eliminar inmersiones"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Profundidad"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Profundidad (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Superado límite de profundidad"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Profundidad:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Nombre del dispositivo"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Inmersión #%d -"
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Inmersión #%d:%s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Ordenador de Buceo"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Información de la inmersión"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Notas de la inmersión"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Duración de la inmersión"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Alerta de duración de inmersión"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Información sobre la ruración de lainmersión"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Ordenador de Buceo"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Error al importar datos de inmersiones"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Detalles de la inmersión"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Notas de la inmersión"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Guía"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Inmersión #"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Fuente de lista de inmersiones"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Inmersiones"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Ubicación"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Descargar desde el ordenador de Buceo"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Descargar desde el ordenador de Buceo..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Descargar desde el ordenador de Buceo"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Descargar desde el ordenador de Buceo..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Duración"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Duración (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Editar"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Nombre del dispositivo"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Editar el viaje"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Editar resumen del viaje"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Editar inmersión"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Editar inmersión"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Editar inmersiones"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Editar múltiples inmersiones"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Editar resumen del viaje"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Activar / Desactivar eventos"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Fin"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, 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."
+msgstr ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Equipo"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Error al analizar las muestras"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Error al analizar la fecha"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Error al analizar el tiempo de buceo"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Error al analizar la mezcla de gas"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Error al analizar el conteo de mezcla de gas"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Error al analizar la máxima profundidad"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Error al analizar las muestras"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Error al registrar el manejador de cancelación"
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Error al registrar los datos"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Error al registrar el manejador de eventos"
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr ""
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Evento: aguardando acción del usuario"
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Expandir todos"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "No se pudo abrir los %i archivos."
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "No se pudo analizar '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "No se pudo analizar '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "No se pudo leer '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "No se pudo leer '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "Pies"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Archivo"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filtros"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Vi"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Gas usado"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Mezcla de gas"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Ayuda"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Importar Archivo(s) XML..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Info"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Ene"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel y otros, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Lista"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "Litro"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Ubicación"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Más Prolongado"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Inmersión más prolongada"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Alerta de Batería Baja"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Advertencia de Batería Baja"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Mar"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Marcador"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Guía"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Advertencia de tiempo max deco"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Profundidad max"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Max SAC"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Max. Temp."
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -585,270 +967,341 @@ msgstr ""
 "Duración :%d minutos\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Pres. max."
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Máxima"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Máximo"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Máxima"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Mayo"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Eliminar inmersiones"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Combinar viaje con el viaje de encima"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Combinar viaje con el viaje de abajo"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "Metro"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Profundidad mínima"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Min SAC"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Min Temp"
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Mínima"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Mínima"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Opciones Varias"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Lu"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Software multi-plataforma escrito en C para DiveLog"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Nuevo"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Nuevo número de partida"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Nombre del dispositivo"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "No se degistran datos de botella"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Notas"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Nov"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Oct"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Error de lectura"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Abrir archivo"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Abrir..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr ""
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Alarma de Ascenso PpO2"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Aviso de Ascenso PpO2"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Aviso Verde PpO2"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "PSI"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Presión"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Presión:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Impresión gráfica"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Imprimir sólo inmersiones seleccionadas"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Imprimir selección"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Tipo de impresión"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Perfil"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Perfil"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Salir"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Alerta tiempo de gas restante"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Aviso tiempo de gas restante"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Valoración"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Leyendo inmersiones %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Eliminar viaje"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Eliminar inmersión del viaje"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Eliminar selección de inmersiones del viaje"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Renumerar"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Renumerar..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Intentar de nuevo"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "SAC"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Añadir inmersión"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE archivo"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Violación de parada de seguridad"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Sa"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "¿Guardar cambios?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Guardar Archivo Como"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Guardar..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Media de tiempo"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Seleccionar eventos"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Seleccionar eventos..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Sep"
 
@@ -860,126 +1313,222 @@ msgstr ""
 "Escritura corta al archivo req.txt \n"
 "¿Está el Zúrich Uemis correctamente conectado?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Más corta"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Inmersión más corta"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Mostrar Columnas"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Eliminar inmersión"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Tamaño"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarma de Velocidad"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Advertencia de velocidad`"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Inicio"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Estadísticas"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Estadísticas"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Estadísticas"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Traje"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "Do"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Interv. Superf."
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Impresión de tabla"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Sugerencia de cambio de botella"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Información sobre presión de botella"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Temperatura"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Todo"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Ju"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Tiempo"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Activar / Desactivar Zoom"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Tiempo total"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Peso:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Viaje %1$s, %2$s %3$d, %4$d (%5$d inmersión)"
 msgstr[1] "Viaje %1$s, %2$s %3$d, %4$d (%5$d inmersiones)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Ma"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Tipo"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: sistema de archivos esta casi lleno \n"
 "Desconectar / conectar el ordenador de buceo \n"
@@ -995,69 +1544,98 @@ msgstr ""
 "Desconectar / conectar el ordenador de buceo\n"
 "e inténtelo de nuevo"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Fallo al intentar iniciar Uemis"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "No es posible crear el contexto de libdivecomputer"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr "No es posible crear el analizador para %s %s"
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "No se pudo abrir  %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Unidades"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Ver"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Temp. de Agua"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Mi"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Peso"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Sistema de lastre"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Peso:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML archivo"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Año"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Estadísticas anuales"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1065,7 +1643,7 @@ msgstr ""
 "Has guardado los cambios \n"
 "¿Te gustaría guardar los cambios antes de cerrar el archivo de datos?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1074,201 +1652,320 @@ 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:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "aire"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "tiempo de aire"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "tobillo"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "ascenso"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "lastre en el arnes"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "cinturón"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "favorito"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "techo"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "techo (parada de seguridad)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "pie^3"
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "deco"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "parada de profundidad"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "parada de profundidad"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "duración de inmersión"
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Ene"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Inmersión #%d -"
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Imprimir sólo inmersiones seleccionadas"
+
+#: statistics.c:640
+#, 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
 msgid "ft"
 msgstr "pies"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "cambio de mezcla"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "encabezado"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integrado"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "Número de evento inválido"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "libra"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "Profundidad Max"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "más de %d días"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "más de %d días"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "ninguno"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr ""
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "parada de seguridad"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "parada de seguridad (obligatoria)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "parada de seguridad (voluntaria)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "superficie"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Alarma de nivel de tejidos"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
-msgstr "José Ángel Tortosa Delfa\n"
+msgstr ""
+"José Ángel Tortosa Delfa\n"
 "Pablo García Castro\n"
 "Matthias Kaehlcke\n"
 "Sergio Schvezov\n"
 "Auni Somero\n"
 "and Henrik Brautaset Aronsen (who doesn't speak Spanish)"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "transmisor"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "desc"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "desconocido"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "no especificado"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "violación"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "peso"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "carga"
 
 #~ msgid "About"
 #~ msgstr "Acerca de"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Automáticamente agrupar las inmersiones en viajes"
+
+#~ msgid "Delete"
+#~ msgstr "Eliminar"
+
 #~ msgctxt "Depth"
 #~ msgid ""
 #~ "Depth\n"
@@ -1285,6 +1982,9 @@ msgstr "carga"
 #~ "Duración\n"
 #~ "Total"
 
+#~ msgid "Pretty print"
+#~ msgstr "Impresión gráfica"
+
 #~ msgctxt "SAC"
 #~ msgid ""
 #~ "SAC\n"
@@ -1308,3 +2008,6 @@ msgstr "carga"
 #~ msgstr ""
 #~ "Temperature\n"
 #~ "Promedio"
+
+#~ msgid "deco"
+#~ msgstr "deco"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 0832d7ecf..c264c0395 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-10-21 16:31+0200\n"
 "Last-Translator: Miika Turkia <miika.turkia@gmail.com>\n"
 "Language-Team: Finnish\n"
@@ -19,562 +19,944 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Kuukausi"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr "Valitse sukellustietokone ja laitenimi."
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "#"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, 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:229
+#: print.c:584
 #, 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"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 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:529
+#: statistics.c:551
 #, 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:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%d pv %d t %d min"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%d t %d min"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) tai (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Muuta sukelluksen tietoja"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "Tietoja Subsurfacesta"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Lisää sukellus..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Lisää sukellus"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Liitä yllä olevaan retkeen"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Keskilämpötila"
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "huhti"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "elo"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Automaattinen ryhmittely"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Ryhmittele sukellukset retkiin automaattisesti"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Keskim."
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Keskim."
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Keskim."
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Keskim."
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Keskisyvyys"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Pintakulutus"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Keskilämpötila"
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Keskipituus"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Sukelluspari"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Valitse oletustiedosto"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Valitse tietoihin liitettävät XML-tiedostot"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Sulje"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Supista kaikki retket"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Liitä uuteen retkeen"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "kuutiojalka"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Säiliöt"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Säiliöt"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Säiliöt"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Ajankohta"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Päivä ja aika"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Päivä:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "joulu"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Oletustiedosto"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Poista"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Poista sukellus"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Poista sukellus"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Poista sukellukset"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Syvyys"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Syvyys (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Syvyysraja ylitetty"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Syvyys:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Laitenimi"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Sukellus #%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Sukellus %1$d: %3$d. %2$skuuta %4$04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Sukellustietokone"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Tiedot"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Muistiinpanot"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Sukellusaika"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Huomautus: sukellusaika"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Tiedotus: sukellusaika"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Sukellustietokone"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Virhe sukellusten jäsentämisessä"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Tiedot"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Muistiinpanot"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Sukellusvanhin"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Sukellus"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Sukelluslistan kirjasin"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Sukellusvanhin"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Sukelluskerrat"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Kohde"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Hae sukellustietokoneelta"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Hae sukellustietokoneelta..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Hae sukellustietokoneelta"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Hae sukellustietokoneelta..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Kesto"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Kesto (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Muuta"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Laitenimi"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Muuta retken tietoja"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Muuta retken tietoja"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Muuta sukelluksen tietoja"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Muuta sukelluksen tietoja"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Muuta sukelluksen tietoja"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Muuta valittujen sukellusten tietoja"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Muuta retken tietoja"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Näytä / piilota tapahtumamerkit"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Loppu"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, fuzzy
+msgid "Ending Depth"
+msgstr "Pienin syvyys"
+
+#: 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 ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Virhe näytteiden tulkinnassa"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Virhe ajan jäsentämisessä"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Virhe sukelluksen keston jäsentämisessä"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Virhe kaasuseoksen jäsentämisessä"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Virhe kaasuseosten määrän jäsentämisessä"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Virhe maksimisyvyyden jäsentämisessä"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Virhe näytteiden tulkinnassa"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Virhe perumiskäsittelijän rekisteröinnissä."
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Virhe tiedon rekisteröinnissä"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Virhe tapahtumakäsittelijän rekisteröinnissä."
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, fuzzy, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Tapahtuma: systime=%<PRId64>, devtime=%u\n"
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Tapahtuma: odotetaan käyttäjän toimia"
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Laajenna kaikki retket"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "%i tiedoston avaaminen epäonnistui."
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Tiedoston '%s' lukeminen epäonnistui."
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Tiedoston '%s' avaaminen epäonnistui"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Tiedoston '%s' lukeminen epäonnistui.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "helmi"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "jalka"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Tiedosto"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Suodattimet"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "pe"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Kulutus"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Kaasuseos"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Ohje"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Liitä tiedot XML-tiedostosta..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Tiedot"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "tammi"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "heinä"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "kesä"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel et al., 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Sukelluslista"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "litra"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Kohde"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Loki"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Pisin"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Pisin sukellus"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Huomautus: heikko paristo"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Varoitus: heikko paristo"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "maalis"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "merkki"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Sukellusvanhin"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Varoitus: etappipysähdysaika"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Suurin syvyys"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Suurin pintakulutus"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Ylin lämpötila"
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -585,270 +967,341 @@ msgstr ""
 "Kesto: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Nimellispaine"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Suurin"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Suurin"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Korkein"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "touko"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Poista sukellukset"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Liitä retki yllä olevaan retkeen"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Liitä retki alla olevaan retkeen"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "metri"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Pienin syvyys"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Pienin pintakulutus"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Alin lämpötila"
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Pienin"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Pienin"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Alin"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Sekalaiset asetukset"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "ma"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Usean laitealustan sukelluspäiväkirjaohjelma C-kielellä"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Uusi"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Uusi aloitusnumero"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Laitenimi"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Ei tietoja säiliöistä"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Muistiinpanot"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "marras"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "Happikertymä"
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "Happikertymä"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "loka"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Outo pthread-virheen paluukoodi"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Avaa..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO2"
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Huomautus: hapen osapaine"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Varoitus: hapen osapaine"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Varoitus: hapen osapaine (green) TODO"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Asetukset..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Paine"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Paine:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Hieno tuloste"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Tulosta valitut sukellukset"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Tulosteen valinta"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Tulosteen tyyppi"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profiilikuvaaja"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profiilikuvaaja"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Lopeta"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Huomautus: kaasumäärä"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Varoitus: kaasumäärä"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Yleisarvio"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Luetaan sukellusta %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Poista retki"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Erota sukellus pois retkestä"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Erota valitut sukellukset pois retkestä"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Uudellennumeroi"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Uudellennumeroi..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Yritä uudestaan"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "Pintakulutus"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Lisää sukellus"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE-tiedosto"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Turvapysähdyksen laiminlyönti"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "la"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Tallenna muutokset?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Tallenna nimellä"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Tallenna..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Keskipituus"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Valitse tapahtumat"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Valitse tapahtumat..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "syys"
 
@@ -860,126 +1313,222 @@ msgstr ""
 "Tiedoston req.txt kirjoittaminen epäonnistui.\n"
 "Onko Uemis Zurich kytketty oikein?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Lyhin"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Lyhin sukellus"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Näytä sarakkeet"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Poista sukellus"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Tilavuus"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Huomautus: nousunopeus"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Varoitus: nousunopeus"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Alku"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Tilastot"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Tilastot"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Tilastot"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Puku"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "su"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Pinta-aika"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Taulukkotuloste"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Säiliönvaihtoehdotus"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Tiedotus: säiliöpaine"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Lämpötila"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Lämpötila"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Lämpötila:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Kaikki"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "to"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Kello"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Venytä sukellusprofiilikuvaajaa"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Yhteensä"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Kokonaisaika"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Massa:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Retki %1$s, %3$d. %2$skuuta %4$04d (%5$d sukellus)"
 msgstr[1] "Retki %1$s, %3$d. %2$skuuta %4$04d (%5$d sukellusta)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "ti"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Tyyppi"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: tiedostojärjestelmä on lähes täynnä.\n"
 "Liitä sukellustietokone uudestaan\n"
@@ -995,69 +1544,98 @@ msgstr ""
 "Liitä sukellustietokone uudestaan\n"
 "ja yritä uudestaan."
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Uemiksen lukeminen epäonnistui"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "libdivecomputer kontekstin luominen epäonnistui"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr "Jäsentäjän luominen %s %s epäonnistui"
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, fuzzy, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Avaaminen epäonnistui %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Yksiköt"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Näytä"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Tilavuus:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Veden lämpötila"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "ke"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Painot"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Painot"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Massa:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML-tiedosto"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Vuosi"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Vuositilastot"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1065,7 +1643,7 @@ msgstr ""
 "Sinulla on tallentamattomia muutoksia.\n"
 "Haluatko tallentaa muutokset ennen tietojen sulkemista?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1074,192 +1652,304 @@ msgstr ""
 "Tiedosto %s on muuttunut.\n"
 "Haluatko tallentaa muutokset ennen tietojen sulkemista?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "ilma"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "Ilma-aika"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "nilkkapaino"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "Nousu"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "selkäpaino"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "vyöpaino"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "kirjanmerkki"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "katto"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "katto (turvapysähdys)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "ft³"
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "etappipysähdys"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "syväpysähdys"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "syväpysähdys"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "sukellusaika"
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "tammi"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Sukellus #%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Tulosta valitut sukellukset"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Tulosta valitut sukellukset"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "kaasun vaihto"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "suunta"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integroitu"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "tuntematon tapahtumanumero"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "pauna"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "Suurin syvyys"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "yli %d päivää"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "yli %d päivää"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "ei mitään"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "Pa"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr ""
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "turvapysähdys"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "turvapysähdys (pakollinen)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "turvapysähdys (vapaaehtoinen)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "pinta"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "kudoskertymän varoitus"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr ""
 "Tommi Saviranta\n"
 "Miika Turkia"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "lähetin"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "tuntematon"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "tuntematon"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "määrittelemätön"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "rike"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "Massa"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "työmäärä"
 
@@ -1268,3 +1958,15 @@ msgstr "työmäärä"
 
 #~ msgid "About"
 #~ msgstr "Tietoja"
+
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Ryhmittele sukellukset retkiin automaattisesti"
+
+#~ msgid "Delete"
+#~ msgstr "Poista"
+
+#~ msgid "Pretty print"
+#~ msgstr "Hieno tuloste"
+
+#~ msgid "deco"
+#~ msgstr "etappipysähdys"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 31e144ed9..41548270e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-27 02:44+0200\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\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,554 +19,944 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > mois"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Veuillez choisir un ordinateur de plongée et un périphérique. "
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "N°"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr "%1$s%2$s %4$d %3$s %5$d,   %6$d:%7$02d"
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr "%1$s %3$d %2$s, %4$d,   %5$dh%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s %3$d %2$s %4$d, %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr "%1$s %3$d %2$s %4$d, %5$2d:%6$02d"
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%d j %d h %d min"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%d h %d min"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) ou (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Modifier les plongées"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "À propos de Subsurface"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Ajouter une plongée..."
 
-#: divelist.c:2077
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Ajouter une plongée"
 
-#: divelist.c:2156
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Ajouter au groupe au-dessus"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Temp. moy."
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "Avril"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Août"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Grouper automatiquement"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Grouper automatiquement les plongées"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Moyenne"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Moyenne"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Moyenne"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Moyenne"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Profondeur moy."
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Consommation d'air moy."
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Temp. moy."
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Temps moy."
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:482 info.c:909 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Binôme"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Choisissez le fichier XML par défaut"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Choisissez le fichier XML à importer dans les données actuelles"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Fermer"
 
-#: divelist.c:2173
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Tout replier"
 
-#: divelist.c:2146
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Créer un nouveau groupe au-dessus"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "Pieds³"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Blk"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Block"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Blocks"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Date"
 
-#: info.c:774
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: info.c:784
+#: info.c:1011
 msgid "Date:"
 msgstr "Date :"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Déc."
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Fichier XML par défaut"
 
-#: divelist.c:1946 divelist.c:2025 divelist.c:2064
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
+
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Supprimer la plongée"
 
-#: divelist.c:1948 divelist.c:2063
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Supprimer les plongées"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Profondeur"
 
-#: info.c:834
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Profondeur (%s) :"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Profondeur plafond dépassée"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Profondeur :"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Nom du périphérique"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Plongée n°%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Plongée n°%d - %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:667 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Ordinateur de plongée"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Détails de plongée"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Notes de Plongée"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Temps de plongée"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Alerte temps de plongée"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Information du temps de plongée"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Ordinateur de plongée"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Erreur à l'import des données de plongées"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Détails de plongée"
 
-#: info.c:481
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Notes de Plongée"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Chef de Palanquée"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Plongée n°"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Police pour la liste de plongée"
 
-#: info.c:908
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Chef de palanquée"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Plongées"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Lieu"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Télécharger depuis l'ordinateur de plongée"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Télécharger depuis l'ordinateur de plongée..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Télécharger depuis l'ordinateur de plongée"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Télécharger depuis l'ordinateur de plongée..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Durée"
 
-#: info.c:829
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Durée (min)"
 
-#: info.c:224
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Modifier"
 
-#: info.c:626
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Nom du périphérique"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Modifier les informations du groupe"
 
-#: divelist.c:2085
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Modifier le résumé du groupe"
 
-#: divelist.c:2061
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Modifier la plongée"
 
-#: divelist.c:2060
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Modifier la plongée"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Modifier les plongées"
 
-#: info.c:469
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Modifier plusieurs plongées"
 
-#: info.c:449
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Modifier le résumé du groupe"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Activer / Désactiver évênements"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Fin"
 
-#: gtk-gui.c:1130 info.c:502
+#: planner.c:1139
+#, 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."
+msgstr ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Équipement"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Impossible d'analyser des échantillons"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Impossible d'analyser l'heure"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Impossible d'analyser le temps de plongée"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Impossible d'analyser le mélange gazeux"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Impossible d'analyser le nombre de mélange gazeux"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Impossible d'analyser la profondeux maximale"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Impossible d'analyser des échantillons"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Impossible d'enregistrer le gestionnaire d'annulation."
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Impossible d'enregistrer de la date"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Impossible d'enregistrer le gestionnaire d'événement."
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Événement : systime=%<PRId64>, devtime=%u\n"
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Événement : attente d'une action de l'utilisateur"
 
-#: divelist.c:2170
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Tout déplier"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Impossible de l'ouverture du fichier %i."
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Impossible d'analyser « %s »"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Impossible d'analyser « %s ».\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Impossible de la lecture « %s »"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Impossible de lire « %s ».\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Fév."
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "Pieds"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Fichier"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filtrer"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Ven."
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Air utilisé"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Mélange gazeux"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Aide"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Importer les fichiers XML..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Information"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Janv."
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Juil."
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Juin"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel et autres, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "Litre"
 
-#: divelist.c:1273 info.c:454 info.c:476 info.c:903 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Lieu"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Journal"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Plus longue"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Plongée la plus longue"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Alarme de batterie faible"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Avertissement de batterie faible"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Mar."
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Marker"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Chef"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Avertissement de temps de décompression max"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Profondeur max."
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Consommation d'air max."
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Temp. max."
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -577,271 +967,340 @@ msgstr ""
 "Durée : %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "PressionMax"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Mai"
 
-#: divelist.c:2093
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Supprimer les plongées"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Fusionner le groupe avec le groupe au dessus"
 
-#: divelist.c:2103
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Fusionner le groupe avec le groupe au dessous"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "Mètre"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Profondeur min."
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Consommation d'air min."
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Temp. min."
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Options diverses"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Lun."
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Journal de plongée multi-système écrit en C"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Nouveau"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Nouveau numéro de départ"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Nom du périphérique"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Pas d'information sur le block"
 
-#: info.c:459 info.c:494 info.c:917
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Notes"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Nov."
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Oct."
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Étrange erreur pthread retournée"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Ouvrir Fichier"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO2"
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Alarme PO2 ascendant"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Avertissement PO2 ascendant"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Avertissement PO2 Vert"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "PSI"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Préférences"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Préférences..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Pression"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Pression :"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Impression mise en forme"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Imprimer uniquement les plongées selectionnées"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Imprimer la sélection"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Type d'impression"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profil"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Quitter"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Alerte temps air restant"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Avertissement temps d'air restant"
 
-#: info.c:487 info.c:914
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Évaluation"
 
-#: uemis-downloader.c:445
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Lecture de la plongée %s"
 
-#: divelist.c:1818 divelist.c:2108
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Supprimer groupe"
 
-#: divelist.c:2164
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Retirer la plongée du groupe"
 
-#: divelist.c:2162
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Retirer les plongées sélectionnées du groupe"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Renuméroter"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Renuméroter..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Essayer à nouveau"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "Consommation d'air"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Ajouter une plongée"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "Fichier SDE"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Violation du palier de sécurité"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Sam."
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
 # Title
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Enregistrement des changements ?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Enregistrer le fichier sous"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Enregistrer..."
 
-#: gtk-gui.c:764
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Temps moy."
+
+#: gtk-gui.c:944
 msgid "Select Events"
 msgstr "Sélection des évènements"
 
-#: gtk-gui.c:921
+#: gtk-gui.c:1375
 msgid "Select Events..."
 msgstr "Sélection des événements..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Sept."
 
@@ -853,126 +1312,221 @@ msgstr ""
 "Écriture partielle des progrès dans le fichier req.txt\n"
 "Est-ce que votre Uemis Zurich est branché correctement ?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Plus courte"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Plongée la plus courte"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Afficher les colonnes"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+msgid "Simulated Dive"
+msgstr ""
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Taille"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarme de vitesse"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Avertissemnt de vitesse"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Début"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Statistiques"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Stats"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:488 info.c:915
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Stats"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Combinaison"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "Dim."
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Intervale de surface"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Impression en tableau"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Changement de block suggéré"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Information de pression block"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temp."
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Température"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Température :"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Trois"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Jeu."
 
-#: info.c:789 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Temps"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Changer de zoom"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Temps Total"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Poids:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Groupe %1$s %3$d %2$s %4$d (%5$d plongée)"
 msgstr[1] "Groupe %1$s %3$d %2$s %4$d (%5$d plongées)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Mar."
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Type"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich : le disque dur est presque plein\n"
 "Débranchez et re-branchez l'ordinateur\n"
@@ -988,69 +1542,98 @@ msgstr ""
 "Débranchez et re-branchez l'ordinateur\n"
 "et re-essayez"
 
-#: uemis-downloader.c:781
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Impossible d'initialiser Uemis"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "Impossible de créer un context libdivecomputer"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr "Impossible de créer une analyse pour %s %s"
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Impossible d'ouvrir %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Unités"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Vue"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Volume :"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Temp. de l'eau"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Mer."
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Poids"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Système de poids"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Poids:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "Fichier XML"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Année"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Statistiques annuelles"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1058,7 +1641,7 @@ msgstr ""
 "Vous avez des changements non-enregistrés.\n"
 "Souhaitez-vous enregistrer ces changements avant de fermer ?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1067,192 +1650,313 @@ msgstr ""
 "Vous avez des changements non-enregistrés dans le fichier : %s \n"
 "Souhaitez-vous enregistrer ces changements avant de le fermer ?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "air"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "temps d'air"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "cheville"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "ascension"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "poids dorsaux"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "ceinture"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "marque-page"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "plafond"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "plafond (palier de sécurité)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "pied³"
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "décompression"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "Arrêt profond"
+
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "Arrêt profond"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "Temps de plongée"
 
-#: dive.c:113 divelist.c:1264 info.c:834
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Janv."
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Plongée n°%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Imprimer uniquement les plongées selectionnées"
+
+#: statistics.c:640
+#, 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
 msgid "ft"
 msgstr "pied"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "Changement de gas"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "entête"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "intégré"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "numéro d'événement non valide"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "livre US"
 
-#: dive.c:108 info.c:834
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "prof. max"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "plus de %d jours"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "plus de %d jours"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "aucun"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr "rbt"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr "rgbm"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "palier de sécurité"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "palier de sécurité (obligatoire)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "palier de sécurité (volontaire)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "surface"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Avertissement de niveau « tissue »"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr ""
 "Pierre-Yves Chibon\n"
 "Jean-Noël Rouchon\n"
 "Stéphane Raimbault"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "transmetteur"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "inconnu"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "inconnu"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "non specifié"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "violation"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "poids"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "charge"
+
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Grouper automatiquement les plongées"
+
+#~ msgid "Pretty print"
+#~ msgstr "Impression mise en forme"
+
+#~ msgid "deco"
+#~ msgstr "décompression"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 072a509d6..32f5de0a1 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\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,562 +19,943 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Mjesec"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr "Odaberite ronilačko računalo i naziv uređaja."
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "#"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr "%1$s%2$s %4$d. %3$s %5$d   %6$d:%7$02d"
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d   %5$dh%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %dh %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dst %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) ili (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Uredi urone"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr ""
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Dodaj uron..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Dodaj uron"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Dodaj u gornju grupu"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Prosj. temp."
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "Tra"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Kol"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Automatsko grupiranje"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Automatski grupiraj urone"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Ø"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Prosj. dubina"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Prosj. SAC"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Prosj. temp."
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Prosj. trajanje"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "Bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Buddy"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celzijus"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Odaberite defaultnu XML datoteku"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Odaberite XML datoteke za uvoz u trenutačnu datoteku"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Zatvori"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Zatvori sve grupe"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Kreiraj novu grupu iznad"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "CuSt"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Boca"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Boca"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Boce"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Datum i vrijeme"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Pro"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Defaultna XML datoteka"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Obriši"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Obriši uron"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Obriši uron"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Obriši urone"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Dubina"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Dubina (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Premašeno ograničenje dubine"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Dubina:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Naziv uređaja"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, fuzzy, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Uron #%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Uron #%d - %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Ronilačko računalo"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Informacije o uronu"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Bilješke"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Vrijeme urona"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Alarm: Trajanje urona"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Info: Trajanje urona"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Ronilačko računalo"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr ""
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Podaci o uronu"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Bilješke"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Voditelj"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Uron br."
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Font za listu urona"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Voditelj"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Uroni"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Lokacija"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Preuzmi s ronilačkog računala"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Preuzmi s ronilačkog računala..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Preuzmi s ronilačkog računala"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Preuzmi s ronilačkog računala..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Trajanje"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Trajanje (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Uredi"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Naziv uređaja"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Uredi informacije o grupi"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Uredi sažetak grupe"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Uredi uron"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Uredi uron"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Uredi urone"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Uredi više urona"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Uredi sažetak urona"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Uključi/isključi događaje"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Kraj"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, 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."
+msgstr ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Oprema"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+msgid "Error obtaining water salinity"
+msgstr ""
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr ""
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr ""
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr ""
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr ""
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr ""
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr ""
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr ""
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr ""
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr ""
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr ""
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr ""
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Otvori sve"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Nije uspjelo otvaranje %i datoteka"
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Nije uspjelo parsiranje '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Nije uspjelo parsiranje '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Nije uspjelo čitanje '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Nije uspjelo čitanje '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Velj"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "Stope"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Datoteka"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filter"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Pet"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Potrošeno plina"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Mješavina"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Pomoć"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Uvezi XML datoteke..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Informacije"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Sij"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Srp"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Lip"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel i drugi, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Popis"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "Litra"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Lokacija"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Dnevnik"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Maks."
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Najduži uron"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Alarm: Baterija pri izmaku"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Upozorenje: Baterija pri izmaku"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Ožu"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Oznaka"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Master"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Upozorenje: Max. vrijeme dekompresije"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Maks. dubina"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Najveći SAC"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Maks. temp."
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -585,270 +966,341 @@ msgstr ""
 "Trajanje: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Maks. pritisak"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Max."
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Max."
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Svi"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Obriši urone"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Spoji s grupom iznad"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Spoji s grupom ispod"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "Metar"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Najmanja dubina"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Najmanji SAC"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Min. temp."
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Min."
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Min."
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Ostale opcije"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Pon"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Višeplatformski program za vođenje ronilačkog dnevnika pisan u C-u"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Novi"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Novi početni broj"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Naziv uređaja"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Nema podatka o boci"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Bilješke"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Stu"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr ""
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Lis"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr ""
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Otvori datoteku"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Otvori..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr ""
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "PO2 Alarm: Prebrzi izron"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "PO2 Upozorenje: Prebrzi izron"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "PO2 Upozorenje: Zeleno"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "PSI"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Postavke"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Postavke..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Pritisak"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Pritisak:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Lijep ispis"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Ispiši odabrane urone"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Ispiši odabrano"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Vrsta ispisa"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Ispis..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profil"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Izlaz"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "RTG Alarm"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "RTG Upozorenje"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Ocjena"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Čitanje urona %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Obriši grupu"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Ukloni uron iz grupe"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Ukloni odabrane urone iz grupe"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Renumeriraj"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Renumeriraj..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "SAC"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Dodaj uron"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE Datoteka"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Kršenje sigurnosne stanke"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Sub"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Spremi kao..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Spremi promjene?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Spremi datoteku kao"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Spremi..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Prosj. trajanje"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Odaberi događaje"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Odaberi događaje..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Ruj"
 
@@ -860,126 +1312,222 @@ msgstr ""
 "Greška pri pisanju u datoteku req.txt\n"
 "Je li Uemis Zurich ispravno prikopčan?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Min."
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Najkraći uron"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Prikaži stupce"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Obriši uron"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Veličina"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: Brzina"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Upozorenje: Brzina"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Početak"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Statistika"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Statistika"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Statistika"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Statistika"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Odijelo"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "Ned"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Površinski interval"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Tablični ispis"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Preporučena izmjena boce"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Podaci od pritisku u boci"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Tri"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Čet"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Vrijeme"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Uključi/isključi povećanje"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Ukupno"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Ukupno trajanje"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Težina:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Grupa %1$s, %3$d. %2$s %4$d (%5$d uron)"
 msgstr[1] "Grupa %1$s, %3$d. %2$s %4$d (%5$d urona)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Uto"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Vrsta"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Datotečni sustav je skoro pun\n"
 "Iskopčajte i ponovo ukopčajte uređaj\n"
@@ -995,69 +1543,98 @@ msgstr ""
 "Iskopčajte i ponovo ukopčajte uređaj\n"
 "i pokušajte ponovo"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Uemis greška pri inicijalizaciji"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr ""
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr ""
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, fuzzy, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Nije uspjelo otvaranje %i datoteka"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Jedinice"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Pregled"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Zapremnina:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Temperatura vode"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Sri"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Težina"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Težina"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Težina:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML datoteka"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Godina"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Godišnje statistike"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1065,7 +1642,7 @@ msgstr ""
 "Imate promjena koje nisu spremljene\n"
 "Želite li ih spremiti prije zatvaranja datoteke?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1074,197 +1651,314 @@ msgstr ""
 "Imate promjena koje nisu spremljene u datoteci: %s \n"
 "Želite li ih spremiti prije zatvaranja datoteke?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "zrak"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr ""
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "gležanj"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr ""
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr ""
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "pojas"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr ""
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr ""
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr ""
 
-#: libdivecomputer.c:80
-msgid "deco"
+#: uemis-downloader.c:384
+msgid "data"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:149
+msgid "deco stop"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr ""
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Sij"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Uron #%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Ispiši odabrane urone"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Ispiši odabrane urone"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr ""
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integrirani"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr ""
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr ""
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "US funte"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 #, fuzzy
 msgid "maxdepth"
 msgstr "Maks. dubina"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, c-format
 msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgstr ""
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "više od %d dana"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "više od %d dana"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr ""
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr ""
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr ""
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr ""
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr ""
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr ""
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr ""
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr ""
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr ""
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr "Ivan Habunek"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr ""
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "nepoznat"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "nepoznato"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "nije specificirano"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "povreda"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "težina"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr ""
 
 #~ msgid "About"
 #~ msgstr "O programu"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Automatski grupiraj urone"
+
+#~ msgid "Delete"
+#~ msgstr "Obriši"
+
 #, fuzzy
 #~ msgctxt "Depth"
 #~ msgid ""
@@ -1283,6 +1977,9 @@ msgstr ""
 #~ "Ukupno\n"
 #~ "Trajanje"
 
+#~ msgid "Pretty print"
+#~ msgstr "Lijep ispis"
+
 #, fuzzy
 #~ msgctxt "SAC"
 #~ msgid ""
diff --git a/po/it_IT.po b/po/it_IT.po
index b6900a041..079f098e4 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: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-10-20 16:23+0100\n"
 "Last-Translator: Filippo Moser <filippom@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -18,565 +18,946 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Mese"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Selezionare il computer e la periferica"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "#"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr "%1$s%2$s %4$d. %3$s %5$d   %6$d:%7$02d"
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d   %5$dh%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr "%1$s %3$d. %2$s %4$d %5$2d:%6$02d"
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dt %dst %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dst %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) oder (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Modifica Immersioni"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr ""
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Aggiungi Immersione..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Aggiungi immersione"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Aggiungi al viaggio sopra"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Temperatura Media"
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "Apr"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Ago"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Raggruppa"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Raggruppa automaticamente immersioni in viaggi"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Media"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Profondità media"
 
 # surface air consumption (SAC)
 # consumo d'aria in superficie (CAS)
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "CAS Medio"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Temperatura Media"
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Tempo Medio"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "Bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Compagno"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Selezionare il file XML di default"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Selezionare i files XML da importare nel file dei dati"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Chiudi"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Minimizza tutto"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Crea un nuovo viaggio sopra"
 
 # Cubic foot
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "Piedi cubi"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Bombola"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Bombola"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Bombole"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Data"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Data e Tempo"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Data:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Dic"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "File XML di default"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Cancella"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Cancella Immersione"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Cancella immersione"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Cancella immersioni"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Profondità"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Profondità (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Limite Profondità Superato"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Profondità:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Nome periferica"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Immersione #%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Immersione #%d: %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Computer"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Informazioni sull'immersione"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Note dell'immersione"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Tempo d'Immersione"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Allarme: Tempo d'Immersione"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Info: Tempo d'Immersione"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Computer"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr ""
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Dettagli immersione"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Note dell'immersione"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Dive master"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Immersione n."
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Carattere Immersione"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Immersioni"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Luogo"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Scarica dal Computer"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Scarica dal Computer..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Scarica dal Computer"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Scarica dal Computer..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Durata"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Durata (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Modifica"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Nome periferica"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Modifica Informazioni Viaggio"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Modifica Riepilogo Viaggio"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Modifica Immersione"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Modifica Immersione"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Modifica Immersioni"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Modifica più immerisoni"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Modifica il riepilogo di viaggio"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Abilita / Disabilita Eventi"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Fine"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, 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."
+msgstr ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Attrezzatura"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+msgid "Error obtaining water salinity"
+msgstr ""
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr ""
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr ""
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr ""
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr ""
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr ""
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr ""
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr ""
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr ""
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr ""
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr ""
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr ""
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Espandi tutto"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Impossibile aprire i file %i"
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Impossibile analizzare  '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Impossibile analizzare '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Impossibile leggere '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Impossibile leggere '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "Piedi"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "File"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filtro"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Ven"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Gas Usato"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Miscela di gas"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Aiuto"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Importa file(s) XML..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Informazioni"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Gen"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Lug"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Giu"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel e altri, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Lista"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "Litri"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Luogo"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Più lunga"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Immersione più lunga"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Allarme: Batteria scarica"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Avviso: Batteria Scarica"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Mar"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Marcatore"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Master"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Avviso: Massimo tempo di decompressione"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Profondità Massima"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "CAS Massimo"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Temperatura Massima"
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -587,272 +968,343 @@ msgstr ""
 "Durata: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Pressione Massima"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Massimo"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Massimo"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Massimo"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Mag"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Cancella immersioni"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Raggruppa il viaggio con il viaggio sopra"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Raggruppa il viaggio con il viaggio sotto"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "Metro"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Profondità Minima"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Min. CAS"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Temperatura Minima"
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimo"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimo"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimo"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Opzioni"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Lun"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Programma Multi-piattaforma in C per il log delle immersioni"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Nuovo"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Nuovo numero di inizio"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Nome periferica"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Nessun dato sulla bombola"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Note"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Nov"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr ""
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Ott"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr ""
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Apri File"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Apri..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr ""
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Allarme Incremento PO2"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Avviso Incremento PO2"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Avviso PO2 Verde"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "PSI"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Preferenze..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Pressione"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Pressione:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Stampa Formattata"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Stampa solo le immersioni selezionate"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Stampa selezione"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Stampa tipo"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Stampa..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profilo"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profilo"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Esci"
 
 # remaining gas time (RGT)
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Allarme RGT"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Avviso RGT"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Valutazione"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Lettura immersione %s in corso"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Rimuovi Viaggio"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Rimuovi immersione dal viaggio"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Rimuovi le immersioni selezionate dal viaggio"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Rinumera"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Rinumera..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Riprova"
 
+#: info.c:628
+msgid "S"
+msgstr ""
+
 # SAC surface air consumption
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "CAS"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Aggiungi immersione"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE File"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Violazione della tappa di sicurezza"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Sab"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Salva Come..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Salvare le modifiche?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Salvare il File come"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Salva..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Tempo Medio"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Seleziona Eventi"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Seleziona Eventi..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Set"
 
@@ -864,126 +1316,222 @@ msgstr ""
 "Scrittura breve sul file req.txt\n"
 "Lo Uemis Zurich e' collegato correttamente?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Più corto"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Immersione più corta"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Visualizza Colonne"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Cancella Immersione"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Dimensione"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Allarme Risalita Veloce"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Avviso Risalita Veloce"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Inizio"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Statistiche"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Statistiche"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Statistiche"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Muta"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "Dom"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Intervallo di Superficie"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Stampa Tabella"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Suggerito Cambio Bombola"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Informazione Pressione della bombola"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temperatura"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Albero"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Gio"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Tempo"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Zoom Alternativo"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Totale"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Tempo Totale"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Peso:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Viaggio %1$s, %3$d. %2$s %4$d (%5$d Immersione)"
 msgstr[1] "Viaggio %1$s, %3$d. %2$s %4$d (%5$d Immersioni)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Mar"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Tipo"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Il File System è quasi pieno\n"
 "Disconnettere/Riconnettere il computer\n"
@@ -999,69 +1547,98 @@ msgstr ""
 "Disconnettere/connettere il computer\n"
 "e riprovare"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Impossibile inizializzare l'Uemis"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr ""
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr ""
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, fuzzy, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Impossibile aprire i file %i"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Unità"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Visualizza"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Volume:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Temperatura dell'acqua"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Mer"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Peso"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Sistema di Zavorra"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Peso:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "File XML"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Anno"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Statistiche Annuali"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1069,7 +1646,7 @@ msgstr ""
 "Non hai salvato le modifiche.\n"
 "Vuoi salvare prima di chiudere il file dei dati?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1078,193 +1655,313 @@ msgstr ""
 "Non hai salvato le modifiche al file %s.\n"
 "Vuoi salvare prima di chiudere il file dei dati?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "aria"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr ""
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "caviglia"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr ""
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "peso della piastra"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "cintura"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr ""
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr ""
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "piedi cubi"
 
-#: libdivecomputer.c:80
-msgid "deco"
+#: uemis-downloader.c:384
+msgid "data"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:149
+msgid "deco stop"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr ""
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Gen"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Immersione #%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Stampa solo le immersioni selezionate"
+
+#: statistics.c:640
+#, 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
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr ""
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integrato"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr ""
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "lbs"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 #, fuzzy
 msgid "maxdepth"
 msgstr "Profondità Massima"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, c-format
 msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgstr ""
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "più di %d giorni"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "più di %d giorni"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr ""
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr ""
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr ""
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr ""
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr ""
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr ""
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr ""
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr "Filippo Moser"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr ""
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "sconosciuto"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "non specificato"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "violazione"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "peso"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr ""
 
 #~ msgid "About"
 #~ msgstr "Informazioni"
+
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Raggruppa automaticamente immersioni in viaggi"
+
+#~ msgid "Delete"
+#~ msgstr "Cancella"
+
+#~ msgid "Pretty print"
+#~ msgstr "Stampa Formattata"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 7d8391dc4..f5aee9d38 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-10-22 08:01+0100\n"
 "Last-Translator: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>\n"
 "Language-Team: Norwegian Bokmål\n"
@@ -19,562 +19,944 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Måned"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Velg dykkecomputer og enhet"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "#"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr "%1$s%2$s, %4$d. %3$s %5$d   %6$d:%7$02d"
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr "%1$s. %3$d. %2$s %4$d  %5$dh%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s. %3$d. %2$s %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr "%1$s. %3$d. %2$s %4$d %5$2d:%6$02d"
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dt %dt %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dt %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) eller (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Rediger dykk"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "Om Subsurface"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Nytt dykk..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Nytt dykk"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Slå sammen med turen over"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Snitt-temp."
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "apr"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "aug"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Grupper automatisk"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Grupper dykk som turer automatisk"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Gjennomsnitt"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Snittdybde"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Snitt-SAC"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Snitt-temp."
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Snitt-tid"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Buddy"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Velg standard XML-fil"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Velg hvilke XML-filer du vil importere"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Lukk"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Slå sammen alle"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Lag ny tur over denne"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "ft³"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Flaske"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Flaske"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Flasker"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Dato"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Dato og tid"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Dato:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "des"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Standard XML-fil"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Slett"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Slett dykk"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Slett dykk"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Slett dykk"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Dybde"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Dybde (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Maksgrense for dybde overskredet"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Dybde:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Enhetsnavn"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Dykk #%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Dykk #%d: %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Dykkecomputer"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Informasjon"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Dykk"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Starttid"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Alarm: dykketid"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Info: dykketid"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Dykkecomputer"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Feil ved import av dykkedata"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Detaljer"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Dykk"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Dykkeleder"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Dykk nr."
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Skrifttype for liste"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Dykkeleder"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Dykk"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Sted"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Last ned fra dykkecomputer"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Last ned fra dykkecomputer..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Last ned fra dykkecomputer"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Last ned fra dykkecomputer..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Varighet"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Varighet (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Rediger"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Enhetsnavn"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Rediger turinformasjon"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Rediger tursammendrag"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Rediger dykk"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Rediger dykk"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Rediger dykk"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Rediger flere dykk"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Rediger tursammendrag"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Skru på/av hendelser"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Slutt"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, fuzzy
+msgid "Ending Depth"
+msgstr "Min. dybde"
+
+#: 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 ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Utstyr"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Feil ved lesing av detaljer"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Feil ved lesing av dato"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Feil ved lesing av dykketid"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Feil ved lesing av gassmiks"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Feil ved lesing av gassmiksantall"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Feil ved lesing av maksdybde"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Feil ved lesing av detaljer"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Feil ved registrering av avbruddshåndterer."
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Feil ved registrering av data"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Feil ved registrering av hendelseshåndterer."
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Hendelse: systime%<PRId64>, devtime=%u\n"
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Hendelse: Venter på bruker"
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Ekspander alle"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Fikk ikke åpnet %i filer."
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Kunne ikke lese '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Kunne ikke lese '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Kunne ikke åpne '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Kunne ikke åpne '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "feb"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "fot"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Fil"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filter"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "fre"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Gass brukt"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Gassmiks"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Hjelp"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Importer XML-fil(er)..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Info"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "jan"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "jul"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "jun"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel med flere, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Liste"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Sted"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Logg"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Lengste"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Lengste dykk"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Alarm: dårlig batteri"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Advarsel: dårlig batteri"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "mar"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "markering"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "master"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Advarsel: maks dekotid"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Maks. dybde"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Maks. SAC"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Maks. temp."
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -585,270 +967,341 @@ msgstr ""
 "Tid: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Maks. trykk"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "mai"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Slett dykk"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Slå samme tur med turen over"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Slå sammen tur med turen under"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Min. dybde"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Min. SAC"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Min. temp"
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Ymse valg"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "man"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Dykkelogg i C for flere plattformer"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Ny"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Nytt startnummer"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Enhetsnavn"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Ingen tankinformasjon"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Notater"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "nov"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "okt"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Feil ved retur fra pthread"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Åpne fil"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Åpne..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO2"
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Alarm: oppstigning / PO2"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Advarsel: oppstigning /PO2"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Advarsel: grønn / PO2"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Valg"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Valg..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Trykk"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Trykk:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Pen utskrift"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Skriv ut valgte dykk"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Skriv ut valg"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Utskriftstype"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profil"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Avslutt"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Alarm: gjenværende gasstid"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Advarsel: gjenværende gasstid"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Vurdering"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Leser dykk %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Fjern tur"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Fjern dykk fra tur"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Fjern valgte dykk fra tur"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Oppdater nummerering"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Oppdater nummerering..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "SAC"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Nytt dykk"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE-fil"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Brudd på sikkerhetsstopp"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "lør"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Lagre endringer?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Lagre fil som"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Lagre..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Snitt-tid"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Velg hendelser"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Velg hendelser..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "sep"
 
@@ -860,126 +1313,222 @@ msgstr ""
 "Fikk ikke skrevet ferdig req.txt\n"
 "Er Uemis Zurich plugget i ordentlig?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Korteste"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Korteste dykk"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Vis kolonner"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Slett dykk"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Størrelse"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: oppstigningshastighet"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Advarsel: oppstigningshastighet"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Start"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Statistikk"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Statistikk"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Statistikk"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Drakt"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "søn"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Overflateintervall"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Tabellutskrift"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Tankbytte foreslått"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Info: trykk"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Alle"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "tor"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Tid"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Zoom av/på"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Total tid"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Vekt:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Tur %1$s. %3$d. %2$s %4$d (%5$d dykk)"
 msgstr[1] "Tur %1$s. %3$d. %2$s %4$d (%5$d dykk)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "tir"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Type"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Filsystem er nesten fullt\n"
 "Koble fra og til dykkecomputeren og\n"
@@ -995,69 +1544,98 @@ msgstr ""
 "Koble fra og til dykkecomputeren\n"
 "og prøv igjen"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Klarer ikke å lese fra Uemis"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "Kunne ikke opprette kontekst for libdivecomputer"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr "Kunne ikke lage parser for %s %s"
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Fikk ikke åpnet %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Enheter"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Vis"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Volum:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Vanntemperatur"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "ons"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Vekt"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Vektsystem"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Vekt:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML-fil"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "År"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Årsstatistikk"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1065,7 +1643,7 @@ msgstr ""
 "Du har endringer som ikke er lagret.\n"
 "Vil du lagre disse før du lukker datafila?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1074,196 +1652,314 @@ msgstr ""
 "Du har endringer som ikke er lagret i %s.\n"
 "Vil du lagre disse før du lukker fila?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "luft"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "lufttid"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "ankel"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "oppstigning"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "p-vekt"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "belte"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "bokmerke"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "tak"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "tak (sikkerhetsstopp)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "ft³"
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "deko"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "dypstopp"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "dypstopp"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "dykketid"
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "jan"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Dykk #%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Skriv ut valgte dykk"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Skriv ut valgte dykk"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "gassbytte"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "retning"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integrert"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "ugyldig hendelsesnummer"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "pund"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "maksdybde"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "Min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "mer enn %d dager"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "mer enn %d dager"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "ingen"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr "rbt"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr "rgbm"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "sikkerhetsstopp"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "sikkerhetsstopp (obligatorisk)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "sikkerhetsstopp (frivillig)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "overflate"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "Advarsel: nivå i vev"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr "Henrik Brautaset Aronsen"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "sender"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "ukjent"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "ukjent"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "ikke spesifisert"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "brudd"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "Vekt"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "arbeidsbelastning"
 
 #~ msgid "About"
 #~ msgstr "Om"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Grupper dykk som turer automatisk"
+
+#~ msgid "Delete"
+#~ msgstr "Slett"
+
 #, fuzzy
 #~ msgctxt "Depth"
 #~ msgid ""
@@ -1282,6 +1978,9 @@ msgstr "arbeidsbelastning"
 #~ "Varighet\n"
 #~ "Total"
 
+#~ msgid "Pretty print"
+#~ msgstr "Pen utskrift"
+
 #, fuzzy
 #~ msgctxt "SAC"
 #~ msgid ""
@@ -1307,3 +2006,6 @@ msgstr "arbeidsbelastning"
 #~ msgstr ""
 #~ "Temperatur\n"
 #~ "Gjennomsnitt"
+
+#~ msgid "deco"
+#~ msgstr "deko"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 7e1c173a3..a96f99be5 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-10-28 20:24+0100\n"
 "Last-Translator: Reinout Hoornweg <reinout@xs4all.nl>\n"
 "Language-Team: Dutch\n"
@@ -19,562 +19,944 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Maand"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Selecteer duikcomputer en aansluiting. "
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "Nr."
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, 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:229
+#: print.c:584
 #, 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"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s %3$d %2$s %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, 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:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %du %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%du %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) of (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Duiken bewerken"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "Over Subsurface"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Duik toevoegen..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Duik Toevoegen"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Trip hierboven toevoegen"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Gem. temp."
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "apr"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "aug"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Automatisch groeperen"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Automatisch de duiken in trips groeperen"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Gemiddelde"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Gem. diepte"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Gem. gasverbruik"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Gem. temp."
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Gem. tijd"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Buddy"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Kies standaard XML bestand"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Kies de XML bestanden om te importeren in huidig data bestand"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Sluiten"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Alles inklappen"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Nieuwe trip hierboven invoegen"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "cuft"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Fles"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Fles"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Flessen"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Datum en tijd"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "dec"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Standaard XML bestand"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Duik verwijderen"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Duik verwijderen"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Duiken verwijderen"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Diepte"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Diepte (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Dieptelimiet overschreden"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Diepte:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Apparaatnaam"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Duik nr. %d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Duik nr. %d: %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Duikcomputer"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Duikinformatie"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Duiknotities"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Duiktijd"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Alarm: Duiktijd"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Info: Duiktijd"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Duikcomputer"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Fout bij importeren van duikdata"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Duikdetails"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Duiknotities"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Duikleider"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Duik nr."
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Duiklijst font"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Duikleider"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Duiken"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Locatie"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Download uit duikcomputer"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Download uit duikcomputer..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Download uit duikcomputer"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Download uit duikcomputer..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Duur"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Duur (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Bewerken"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Apparaatnaam"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Trip informatie bewerken"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Trip overzicht bewerken"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Duik bewerken"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Duik bewerken"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Duiken bewerken"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Bewerk meerdere duiken"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Trip overzicht bewerken"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "In-/uitschakelen gebeurtenissen"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Einde"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, fuzzy
+msgid "Ending Depth"
+msgstr "Min. diepte"
+
+#: 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 ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Fout bij het verwerken van de samples"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Fout bij verwerken van de datum en tijd"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Fout bij verwerken van de duikduur"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Fout bij het verwerken van het gasmengsel"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Fout bij het verwerken van het aantal gasmengsels"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Fout bij het verwerken van de maximum duikdiepte"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Fout bij het verwerken van de samples"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Fout bij het registreren van de cancellation handler."
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Fout bij het registreren van de data"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Fout bij het registreren van de event handler."
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Event: systime=%<PRId64>, devtime=%u\n"
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Event: wachten op handeling van gebruiker"
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Alles uitklappen"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Fout bij openen van  %i bestanden."
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Fout bij analyse van '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Fout bij analyseren van '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Fout bij lezen van '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Fout bij lezen van '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "feb"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "voet"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Bestand"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filter"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Vr"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Gas verbruikt"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Gasmengsel"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Help"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Importeer XML bestand(en)..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Informatie"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "jan"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "jul"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "jun"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel en anderen, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Lijst"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Locatie"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Langste"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Langste duik"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Alarm: Lege batterij"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Waarschuwing:Lege batterij"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "mar"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Markering"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Master"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Waarschuwing: Maximale deco-tijd"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Max. diepte"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Max. gasverbruik"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Max. temp."
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -585,270 +967,341 @@ msgstr ""
 "Duur: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Max. druk"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Grootste"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Grootste"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Grootste"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "mei"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Duiken verwijderen"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Trip met bovenstaande samenvoegen"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Trip met onderstaande samenvoegen"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Min. diepte"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Min. gasverbruik"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Min. temp."
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Kleinste"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Kleinste"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Kleinste"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Diverse opties"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Ma"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Multi-platform Duikprogramma in C"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Nieuw"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Nieuw beginnummer"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Apparaatnaam"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Geen flesinformatie"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Notities"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "nov"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "okt"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Onbekende pthread foutmelding"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Bestand openen"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Openen..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO2"
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Alarm: Opstijging / PO2"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Waarschuwing: Opstijging / PO2"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Waarschuwing: PO2 Groen"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Instellingen"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Instellingen..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Druk"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Druk:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Mooi afdrukken"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Alleen geselecteerde duiken afdrukken"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Selectie afdrukken"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Afdruktype"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profiel"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profiel"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Alarm: resterende gas-tijd"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Waarschuwing: resterende gas-tijd"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Waardering"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Lezen duik %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Trip verwijderen"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Duik uit trip verwijderen"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Geselecteerde duiken uit trip verwijderen"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Hernummeren"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Hernummeren..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Opnieuw"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "Gas verbruiksratio"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Duik Toevoegen"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE bestand"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "veiligheidsstop overtreding"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Za"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Aanpassingen opslaan?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Bestand opslaan als"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Opslaan..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Gem. tijd"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "gebeurtenissen selecteren"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "gebeurtenissen selecteren..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "sept"
 
@@ -860,126 +1313,222 @@ msgstr ""
 "Gedeeltelijke schrijfvoortgang naar req.txt bestand\n"
 "Is de Uemis Zurich correkt aangesloten?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Kortste"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Kortste duik"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Kolommen afbeelden"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Duik verwijderen"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Grootte"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: snelheid"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Waarschuwing: snelheid"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Start"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Statistieken"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Statistieken"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Statistieken"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Pak"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "Zo"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Oppervlaktetijd"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Afdrukken in tabelvorm"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Fleswissel voorgesteld"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Info: Flesdruk"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temperatuur"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Temperatuur"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Temperatuur:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Drie"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Do"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Tijd"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Zoom in-/uitschakelen"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Totale"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Totale tijd"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Gewicht:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Trip %1$s %3$d %2$s %4$d (%5$d duik)"
 msgstr[1] "Trip %1$s %3$d %2$s %4$d (%5$d duiken)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Di"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Type"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Bestandssysteem bijna vol\n"
 "AUB de duikcomputer loskoppelen en weer aansluiten\n"
@@ -995,69 +1544,98 @@ msgstr ""
 "AUB de duikcomputer loskoppellen en weer aansluiten\n"
 "en probeer opnieuw"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Uemis niet geïnitialiseerd"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "Kan geen context creëren voor libdivecomputer"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr "Kan geen parser creëren voor %s %s"
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Fout bij openen van  %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Eenheden"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Weergave"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Volume:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Watertemperatuur"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Wo"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Gewicht"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Gewichtssysteem"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML bestand"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Jaar"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Jaarlijkse statistieken"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1065,7 +1643,7 @@ msgstr ""
 "U heeft onopgeslagen wijzigingen.\n"
 "Wilt u deze opslaan voordat u het databestand afsluit?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1074,195 +1652,313 @@ msgstr ""
 "U heeft onopgeslagen wijzigingen in bestand: %s \n"
 "Wilt u deze opslaan voordat u het databestand afsluit?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "lucht"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "resterende luchttijd"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "enkel"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "opstijging"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "backplate-gewicht"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "riem"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "bladwijzer"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "plafond"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "plafond (veiligheidsstop)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "cuft"
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "deco"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "diepe stop"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "diepe stop"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "duiktijd"
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "jan"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Duik nr. %d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Alleen geselecteerde duiken afdrukken"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Alleen geselecteerde duiken afdrukken"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "gaswissel"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "koers"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "Geïntegreerd"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "ongeldig event-nummer"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "US pond"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "Max. diepte"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "meer dan %d dagen"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "meer dan %d dagen"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "geen"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "Pa"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr "RBT"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr "RGBM"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "veiligheidsstop"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "veiligheidsstop (verplicht)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "veiigheidsstop (vrijwillig)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "oppervlakte"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "waarschuwing stikstofbelasting"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr ""
 "Jacco van Koll\n"
 "Reinout Hoornweg"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "zender"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "onbek"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "onbekend"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "Niet gespecificeerd"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "schending"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "Gewicht"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "werklast"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Automatisch de duiken in trips groeperen"
+
+#~ msgid "Delete"
+#~ msgstr "Verwijderen"
+
 #, fuzzy
 #~ msgctxt "Depth"
 #~ msgid ""
@@ -1281,6 +1977,9 @@ msgstr "werklast"
 #~ "Duur\n"
 #~ "Totaal"
 
+#~ msgid "Pretty print"
+#~ msgstr "Mooi afdrukken"
+
 #, fuzzy
 #~ msgctxt "SAC"
 #~ msgid ""
@@ -1306,3 +2005,6 @@ msgstr "werklast"
 #~ msgstr ""
 #~ "Temperatuur\n"
 #~ "Gemiddeld"
+
+#~ msgid "deco"
+#~ msgstr "deco"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 81dbddff9..70ce21fdd 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -2,39 +2,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 13:45+0200\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-12-04 15:31+0300\n"
 "Last-Translator: Sergey Starosek <sergey.starosek@gmail.com>\n"
-"Language-Team: Russiann"
-"Language: ru\n"
+"Language-Team: RussiannLanguage: ru\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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;X-Poedit-SearchPath-0: /home/star/src/Subsurface-2.1\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;X-Poedit-SearchPath-0: /home/star/"
+"src/Subsurface-2.1\n"
 
-#: statistics.c:164
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr "> Месяц"
 
-#: gtk-gui.c:1700
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr "Выберите модель компьютера и устройство."
 
-#: statistics.c:162
+#: statistics.c:182
 msgid "#"
 msgstr "№"
 
-#: statistics.c:561
-#: statistics.c:633
-#: statistics.c:635
-#: statistics.c:637
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/мин"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/мин"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/мин"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr ""
@@ -42,439 +60,711 @@ msgstr ""
 "%2$s, %4$d %3$s, %5$d   %6$d:%7$02d"
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:242
+#: print.c:584
 #, 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"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:381
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s, %3$d %2$s %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:531
+#: statistics.c:551
 #, 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:267
-#: statistics.c:538
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d мин"
 
-#: statistics.c:509
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dд %dч %dмин"
 
-#: statistics.c:511
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dч %dмин"
 
-#: dive.c:722
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) или (%s)"
 
-#: print.c:560
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Редактировать погружения"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
 msgid "1 dive per page"
 msgstr "1 погр. на стр."
 
-#: print.c:556
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
 msgid "6 dives per page"
 msgstr "6 погр. на стр."
 
-#: gtk-gui.c:928
-#: gtk-gui.c:1000
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "О Subsurface"
 
-#: gtk-gui.c:994
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Добавить погружение..."
 
-#: divelist.c:2091
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Добавить погружение"
 
-#: divelist.c:2174
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Добавить к поездке выше"
 
-#: statistics.c:745
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
 msgid "Air Temp"
 msgstr "Темп. возд."
 
-#: info.c:541
+#: info.c:714
 #, c-format
 msgid "Air Temp in %s"
 msgstr "Темп. воздуха в %s"
 
-#: gtk-gui.c:1716
+#: download-dialog.c:391
 msgid "Always prefer downloaded dive"
 msgstr "Приоритет загруженных погружений"
 
-#: main.c:46
+#: main.c:71
 msgid "Apr"
 msgstr "Апр"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Авг"
 
-#: gtk-gui.c:1009
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Автогруппировка"
 
-#: gtk-gui.c:652
-msgid "Automatically group dives in trips"
-msgstr "Автогруппировка погружений в поездке"
-
-#: statistics.c:170
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Средняя"
 
-#: statistics.c:167
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Средняя"
 
-#: statistics.c:173
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Среднее"
 
-#: statistics.c:176
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Средняя"
 
-#: statistics.c:700
-#: statistics.c:737
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Ср. глуб."
 
-#: statistics.c:708
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Сред. SAC"
 
-#: statistics.c:683
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Ср. темп."
 
-#: statistics.c:690
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Ср. время"
 
-#: gtk-gui.c:585
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "Бар"
 
-#: info.c:527
-#: info.c:968
-#: print.c:169
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Партнер"
 
-#: gtk-gui.c:595
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Цельсий"
 
-#: gtk-gui.c:506
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Выберите XML файл по умолчанию"
 
-#: gtk-gui.c:1604
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Выберите XML файлы для импорта в текущий файл данных"
 
-#: gtk-gui.c:990
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Закрыть"
 
-#: divelist.c:2191
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Свернуть все"
 
-#: divelist.c:2164
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Создать поездку выше"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "куб. фут"
 
-#: divelist.c:1264
-#: gtk-gui.c:615
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Балон"
 
-#: equipment.c:934
-#: equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Балон"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Балоны"
 
-#: divelist.c:1257
-#: print.c:168
-#: statistics.c:728
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/мин"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Дата"
 
-#: info.c:833
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Дата и время"
 
-#: info.c:843
+#: info.c:1011
 msgid "Date:"
 msgstr "Дата:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Дек"
 
-#: gtk-gui.c:657
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "XML файл по умолчанию"
 
-#: divelist.c:1933
-#: divelist.c:1986
-#: divelist.c:2078
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
+
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Удалить погружение"
 
-#: divelist.c:1935
-#: divelist.c:2077
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Удалить погружения"
 
-#: print.c:168
-#: statistics.c:162
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Глуб."
 
-#: info.c:893
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Глубина (%s):"
 
-#: uemis.c:217
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Превышен лимит глубины"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Глубина:"
 
-#: gtk-gui.c:1563
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
+msgstr "Имя устройства"
+
+#: download-dialog.c:330
 msgid "Device or mount point"
 msgstr "Устройство или точка монтирования"
 
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159
-#: print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Погр. №%d - "
 
-#: libdivecomputer.c:305
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Погружение %d: %s %d %04d"
 
-#: gtk-gui.c:1217
-#: info.c:725
-#: statistics.c:719
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Декомпрессиметр"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Информация"
 
-#: gtk-gui.c:1209
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Погружение"
 
-#: statistics.c:729
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Время погр."
 
-#: uemis.c:223
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Предупреждение о времени погруженя"
 
-#: uemis.c:221
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Информация о времени погружения"
 
-#: gtk-gui.c:1534
-msgid "Dive computer"
-msgstr "Декомпрессиметр"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:458
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Ошибка импорта данных погружения"
 
-#: print.c:546
+#: print.c:893
 msgid "Dive details"
 msgstr "Детали погружения"
 
-#: info.c:526
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Погружение"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Инструктор"
 
-#: print.c:168
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Погр#"
 
-#: gtk-gui.c:640
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Шрифт списка"
 
-#: info.c:967
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Инструктор"
 
-#: statistics.c:680
+#: statistics.c:779
 msgid "Dives"
 msgstr "Погружения"
 
-#: gtk-gui.c:1691
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Местонахождение"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Загрузка из декомпрессиметра"
 
-#: gtk-gui.c:993
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Загрузка из декомпрессиметра..."
 
-#: statistics.c:162
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Загрузка из декомпрессиметра"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Загрузка из декомпрессиметра..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Длительность"
 
-#: info.c:888
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Длительность (мин)"
 
-#: info.c:224
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Редактировать"
 
-#: info.c:684
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Имя устройства"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Редактирование поездки"
 
-#: divelist.c:2099
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Краткие данные о поездке"
 
-#: divelist.c:2075
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Редактировать погружение"
 
-#: divelist.c:2074
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Редактировать погружение"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Редактировать погружения"
 
-#: info.c:514
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Множественное редактирование"
 
-#: info.c:491
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Редактировать данные поездки"
 
-#: gtk-gui.c:850
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Разрешить / Запретить события"
 
-#: equipment.c:973
-#: equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Конец"
 
-#: gtk-gui.c:1213
-#: info.c:560
+#: planner.c:1139
+#, 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."
+msgstr ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: libdivecomputer.c:340
+#: libdivecomputer.c:470
 msgid "Error obtaining water salinity"
 msgstr "Ошибка получения солености воды"
 
-#: libdivecomputer.c:288
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Ошибка разбора даты/времени"
 
-#: libdivecomputer.c:310
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Ошибка разбора времени погружения"
 
-#: libdivecomputer.c:349
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Ошибка разбора смеси"
 
-#: libdivecomputer.c:330
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Ошибка разбора счетчика смесей"
 
-#: libdivecomputer.c:320
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Ошибка разбора макс. глубины"
 
-#: libdivecomputer.c:357
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Ошибка разбора выборки"
 
-#: libdivecomputer.c:454
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Ошибка регистрации обработчика завершения."
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Ошибка регистрации данных"
 
-#: libdivecomputer.c:449
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Ошибка регистрации обработчика событий."
 
-#: libdivecomputer.c:424
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Событие: сис.время=%<PRId64>, уст.время=%u\n"
 
-#: libdivecomputer.c:409
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Событие: ожидание действия пользователя"
 
-#: divelist.c:2188
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Развернуть все"
 
-#: gtk-gui.c:596
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Фаренгейт"
 
-#: gtk-gui.c:136
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Не получилось открыть %i файлов."
 
-#: parse-xml.c:1279
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Ошибка разбора '%s'"
 
-#: parse-xml.c:1274
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Ошибка разбора '%s'.\n"
@@ -489,138 +779,179 @@ msgstr "Ошибка чтения '%s'"
 msgid "Failed to read '%s'.\n"
 msgstr "Ошибка чтения '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Фев"
 
-#: gtk-gui.c:581
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "Фут"
 
-#: gtk-gui.c:981
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Файл"
 
-#: gtk-gui.c:984
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Фильтр"
 
-#: gtk-gui.c:1710
+#: download-dialog.c:385
 msgid "Force download of all dives"
 msgstr "Принудительная загрузка всех погружений"
 
-#: main.c:37
+#: main.c:62
 msgid "Fri"
 msgstr "Птн"
 
-#: statistics.c:754
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Расход"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Смесь"
 
-#: gtk-gui.c:572
+#: gtk-gui.c:621
 msgid "General Settings"
 msgstr "Общие настройки"
 
-#: gtk-gui.c:985
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Справка"
 
-#: gtk-gui.c:992
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Импорт XML файла(-ов)..."
 
-#: gtk-gui.c:1003
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Информация"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Янв"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Июл"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Июн"
 
-#: gtk-gui.c:934
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Линус Торвальдс, Дирк Хондел и другие, 2011, 2012"
 
-#: gtk-gui.c:1001
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Список"
 
-#: gtk-gui.c:590
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "Литр"
 
-#: divelist.c:1268
-#: info.c:496
-#: info.c:521
-#: info.c:962
-#: print.c:169
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Местонахождение"
 
-#: gtk-gui.c:982
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Журнал"
 
-#: statistics.c:169
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Максимум"
 
-#: statistics.c:691
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Самый долгий"
 
-#: uemis.c:231
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Сигнал о низком заряде батареи"
 
-#: uemis.c:229
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Предупреждение о низком заряде батареи"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Мар"
 
-#: uemis.c:225
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Метка"
 
-#: print.c:168
+#: print.c:510
 msgid "Master"
 msgstr "Инструктор"
 
-#: uemis.c:219
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Предупреждение макс. времени декомпрессии"
 
-#: statistics.c:698
-#: statistics.c:736
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Макс. глуб."
 
-#: statistics.c:706
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Макс. SAC"
 
-#: statistics.c:681
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Макс. темп."
 
-#: print.c:99
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -631,281 +962,340 @@ msgstr ""
 "Длительность: %d мин\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Макс. давл."
 
-#: statistics.c:172
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: statistics.c:175
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: statistics.c:178
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Максимум"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Май"
 
-#: divelist.c:2066
+#: divelist.c:2339
 msgid "Merge dives"
 msgstr "Объединить погружения"
 
-#: divelist.c:2107
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Объединить с поездкой выше"
 
-#: divelist.c:2117
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Объединить с поездкой ниже"
 
-#: gtk-gui.c:580
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "Метр"
 
-#: statistics.c:699
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Мин. глуб."
 
-#: statistics.c:707
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Мин. SAC"
 
-#: statistics.c:682
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Мин. темп."
 
-#: statistics.c:171
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: statistics.c:174
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: statistics.c:177
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Минимум"
 
-#: gtk-gui.c:646
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Прочие настройки"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Пнд"
 
-#: gtk-gui.c:930
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Кроссплатформенный журнал погружений"
 
-#: gtk-gui.c:986
+#: info.c:628
+#, fuzzy
+msgid "N"
+msgstr "pN"
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Новый"
 
-#: gtk-gui.c:890
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Начать нумерацию с"
 
-#: uemis.c:227
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Имя устройства"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Нет данных о балоне"
 
-#: info.c:501
-#: info.c:552
-#: info.c:976
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Примечания"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Ноя"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1267
-#: gtk-gui.c:678
-#: statistics.c:752
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Окт"
 
-#: libdivecomputer.c:546
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Необычная ошибка возврата pthread"
 
-#: gtk-gui.c:291
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Открыть файл"
 
-#: gtk-gui.c:987
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Открыть..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO2"
 
-#: uemis.c:205
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Сигнал PO2 при подъеме"
 
-#: uemis.c:203
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Предупреждение PO2 при подъеме"
 
-#: uemis.c:200
+#: uemis.c:205
 #, fuzzy
 msgid "PO2 Green Warning"
 msgstr "Предупреждение зеленого PO2"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "PSI"
 
-#: gtk-gui.c:558
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Предпочтения"
 
-#: gtk-gui.c:995
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Предпочтения..."
 
-#: equipment.c:962
-#: equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Давление"
 
-#: gtk-gui.c:584
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Давление:"
 
-#: print.c:583
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
+
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Только выбранные погружения"
 
-#: print.c:578
+#: print.c:925
 msgid "Print selection"
 msgstr "Печать выделенных"
 
-#: print.c:550
+#: print.c:897
 msgid "Print type"
 msgstr "Тип печати"
 
-#: gtk-gui.c:991
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Печать..."
 
-#: gtk-gui.c:1002
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Профиль"
 
-#: gtk-gui.c:999
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Техн. настройки"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Выход"
 
-#: uemis.c:213
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Сигнал RGT"
 
-#: uemis.c:211
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Предупреждение RGT"
 
-#: info.c:532
-#: info.c:973
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Оценка"
 
-#: uemis-downloader.c:333
+#: uemis-downloader.c:364
 #, c-format
 msgid "Reading %s %s"
 msgstr "Чтение %s %s"
 
-#: divelist.c:1796
-#: divelist.c:2122
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Удалить поездку"
 
-#: divelist.c:2182
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Удалить из поездки"
 
-#: divelist.c:2180
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Удалить выделенные из поездки"
 
-#: gtk-gui.c:881
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Перенумеровать"
 
-#: gtk-gui.c:996
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Перенумеровать..."
 
-#: gtk-gui.c:1661
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Повторить"
 
-#: divelist.c:1266
-#: gtk-gui.c:625
-#: statistics.c:162
-#: statistics.c:751
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "SAC"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Добавить погружение"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "Файл SDE"
 
-#: uemis.c:193
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Нарушение остановки безопасности"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "Суб"
 
-#: gtk-gui.c:989
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: gtk-gui.c:222
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Сохранить изменения?"
 
-#: gtk-gui.c:159
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Сохранить файл как"
 
-#: gtk-gui.c:988
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Сохранить..."
 
-#: gtk-gui.c:841
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Ср. время"
+
+#: gtk-gui.c:944
 msgid "Select Events"
 msgstr "Выбрать события"
 
-#: gtk-gui.c:998
+#: gtk-gui.c:1375
 msgid "Select Events..."
 msgstr "Выбрать события..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Снт"
 
@@ -917,122 +1307,202 @@ msgstr ""
 "Прервана запись в файл req.txt\n"
 "Проверьте подключение Uemis Zurich."
 
-#: statistics.c:168
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Минимум"
 
-#: statistics.c:692
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Самый короткий"
 
-#: gtk-gui.c:604
-#: gtk-gui.c:672
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Показать колонки"
 
-#: gtk-gui.c:683
-msgid "Show Partial Pressure Graphs in Profile"
-msgstr "Парциальное давление в профиле"
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
 
-#: equipment.c:959
-#: equipment.c:1494
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Удалить погружение"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Объем"
 
-#: uemis.c:195
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Сигнал скорости"
 
-#: uemis.c:198
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Предупреждение скорости"
 
-#: equipment.c:970
-#: equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Начало"
 
-#: statistics.c:672
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Статистика"
 
-#: gtk-gui.c:1221
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Статистика"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Статистика"
 
-#: divelist.c:1263
-#: gtk-gui.c:635
-#: info.c:533
-#: info.c:974
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Статистика"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Костюм"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "Вск"
 
-#: statistics.c:730
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Пов. инт."
 
-#: print.c:564
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Таблица"
 
-#: uemis.c:215
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Рекомендуется смена балона"
 
-#: uemis.c:209
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Информация о давлении в балоне"
 
-#: gtk-gui.c:670
+#: gtk-gui.c:714
 msgid "Tec Settings"
 msgstr "Техн. настройки"
 
-#: gtk-gui.c:610
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Темп."
 
-#: statistics.c:162
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Температура"
 
-#: gtk-gui.c:594
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: gtk-gui.c:1004
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Три панели"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Чтв"
 
-#: info.c:848
-#: print.c:168
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Время"
 
-#: gtk-gui.c:1010
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Изменить масштаб"
 
-#: statistics.c:166
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Общая"
 
-#: statistics.c:689
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Общее время"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Вес:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:372
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
@@ -1040,12 +1510,11 @@ msgstr[0] "Поездка %1$s, %3$d %2$s %4$d (%5$d погружение)"
 msgstr[1] "Поездка %1$s, %3$d %2$s %4$d (%5$d погружения)"
 msgstr[2] "Trip %1$s, %3$d %2$s %4$d (%5$d погружений)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Втр"
 
-#: equipment.c:1493
-#: equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Тип"
 
@@ -1069,77 +1538,98 @@ msgstr ""
 "Отсоедините и подключите дайв-компьютер\n"
 "и попробуйте заново"
 
-#: uemis-downloader.c:721
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Ошибка инициализации Uemis"
 
-#: libdivecomputer.c:475
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "Невозможно создать контекст libdivecomputer"
 
-#: libdivecomputer.c:273
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr "Невозможно создать анализатор для %s %s"
 
-#: libdivecomputer.c:477
+#: libdivecomputer.c:700
 #, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Невозможно открыть %s %s (%s)"
 
-#: gtk-gui.c:573
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Единицы"
 
-#: gtk-gui.c:983
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Просмотр"
 
-#: info.c:538
-#: statistics.c:738
+#: info.c:711 statistics.c:837
 msgid "Visibility"
 msgstr "Видимость"
 
-#: gtk-gui.c:589
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Объем:"
 
-#: statistics.c:744
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Темп. воды"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "Срд"
 
-#: equipment.c:1020
-#: equipment.c:1620
-#: gtk-gui.c:630
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Груз"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Система весов"
 
-#: gtk-gui.c:599
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Вес:"
 
-#: gtk-gui.c:147
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML файл"
 
-#: statistics.c:162
+#: statistics.c:182
 msgid "Year"
 msgstr "Год"
 
-#: gtk-gui.c:997
-#: statistics.c:370
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Статистика за год"
 
-#: gtk-gui.c:232
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1147,8 +1637,7 @@ msgstr ""
 "У вас есть несохраненные изменения.\n"
 "Хотите ли вы их сохранить перед закрытием журнала?"
 
-#: gtk-gui.c:235
-#: gtk-gui.c:238
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1157,252 +1646,317 @@ msgstr ""
 "У вас есть несохраненные изменения в файле %s.\n"
 "Хотите ли вы их сохранить перед закрытием журнала?"
 
-#: divelist.c:635
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "воздух"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "оставшееся время по воздуху"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "лодыжки"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "подъем"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "спинка"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "Бар"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "пояс"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "закладка"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "потолок"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "потолок (остановка безопасности)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "карабины"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "куб. фут"
 
-#: uemis-downloader.c:353
+#: uemis-downloader.c:384
 msgid "data"
 msgstr "данные"
 
-#: libdivecomputer.c:80
-#: uemis.c:243
+#: libdivecomputer.c:149
 msgid "deco stop"
 msgstr "деко стоп"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "глубокая остановка"
 
-#: uemis-downloader.c:374
+#: uemis-downloader.c:405
 msgid "divelog entry id"
 msgstr "идентификатор записи журнала"
 
-#: uemis-downloader.c:376
+#: uemis-downloader.c:407
 msgid "divespot data id"
 msgstr "ид. места погружения"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "время погружения"
 
-#: dive.c:113
-#: divelist.c:1259
-#: info.c:893
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Янв"
+
+#: statistics.c:678
+#, fuzzy, c-format
+msgid "for all dives"
+msgstr "Принудительная загрузка всех погружений"
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "ид. дополнительных данных погружения"
+
+#: statistics.c:633
+#, fuzzy, c-format
+msgid "for dives #"
+msgstr "Объединить погружения"
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Только выбранные погружения"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Только выбранные погружения"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "фут"
 
-#: libdivecomputer.c:82
-#: libdivecomputer.c:85
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "замена смеси"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "направление"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "интегрированный"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "неверный номер события"
 
-#: dive.c:136
-#: equipment.c:1045
-#: gtk-gui.c:600
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "кг"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "л"
 
-#: dive.c:132
-#: divelist.c:1262
-#: equipment.c:1047
-#: gtk-gui.c:601
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "фунт"
 
-#: dive.c:108
-#: info.c:893
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "м"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "макс. глуб."
 
-#: divelist.c:1260
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "мин"
 
-#: libdivecomputer.c:417
+#: libdivecomputer.c:629
 #, 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)"
 
-#: uemis-downloader.c:378
+#: uemis-downloader.c:409
 msgid "more data dive id"
 msgstr "ид. дополнительных данных погружения"
 
-#: statistics.c:503
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "более %d дней"
 
-#: libdivecomputer.c:85
-#: uemis.c:248
+#: libdivecomputer.c:154
 msgid "non stop time"
 msgstr "время без остановки"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "отсутствует"
 
-#: gtk-gui.c:725
-msgid "pHe"
-msgstr "pHe"
-
-#: gtk-gui.c:730
+#: gtk-gui.c:783
 msgid "pHe threshold"
 msgstr "pHe порог"
 
-#: gtk-gui.c:708
-#: gtk-gui.c:713
-msgid "pN"
-msgstr "pN"
+#: gtk-gui.c:765
+#, fuzzy, c-format
+msgid "pN%s threshold"
+msgstr "pHe порог"
 
-#: gtk-gui.c:691
-#: gtk-gui.c:696
-msgid "pO"
-msgstr "pO"
+#: gtk-gui.c:746
+#, fuzzy, c-format
+msgid "pO%s threshold"
+msgstr "pHe порог"
 
-#: dive.c:41
+#: dive.c:42
 msgid "pascal"
 msgstr "Па"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "PSI"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr "оставшееся время на дне"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr "rgbm"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "остановка безопасности"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "остановка безопасности (обязательно)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "остановка безопасности (добровольно)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "поверхность"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "предупреждение насыщения тканей"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:936
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr "Sergey Starosek"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "передатчик"
 
-#: equipment.c:1386
-#: equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "неизв"
 
-#: libdivecomputer.c:83
-#: statistics.c:543
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "неизвестно"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "не указано"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "нарушение"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "вес"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "нагрузка"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Автогруппировка погружений в поездке"
+
 #~ msgid "Delete"
 #~ msgstr "Удалить"
 
-#~ msgid "Delete Dive"
-#~ msgstr "Удалить погружение"
-
-#~ msgid "Device name"
-#~ msgstr "Имя устройства"
-
 #~ msgid "Pretty print"
 #~ msgstr "Профиль"
+
+#~ msgid "Show Partial Pressure Graphs in Profile"
+#~ msgstr "Парциальное давление в профиле"
+
+#~ msgid "pHe"
+#~ msgstr "pHe"
+
+#~ msgid "pO"
+#~ msgstr "pO"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 33c3c4950..8d5e69920 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\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,562 +19,944 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Mesiac"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr "Voľba typu počítača a zariadia. "
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr "#"
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, 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:229
+#: print.c:584
 #, 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"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 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:529
+#: statistics.c:551
 #, 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:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %dh %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dh %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) alebo (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Editovať ponory"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr "O Subsurface"
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Pridať Ponor..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Pridať ponor"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Pridať do akcie vyššie"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Priemerná teplota"
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "Apr"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "Aug"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Automatické zgrupovanie"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Automatické zrgupovanie do akcii"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Priemer"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Priemer"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Priemer"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Priemer"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Priemerná hĺbka"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Priemerná spotreba"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Priemerná teplota"
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Priemerný čas"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Partner"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Vyber default XML súbor"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Vyber XML súbor pre import do aktuálneho data súboru"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Zredukovať všetky"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Vytvoriť novú akciu nad"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "kubická stopa"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Fľaša"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Fľaša"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Fľaše"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Dátum"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Dátum a čas"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Dátum:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "Dec"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Default XML Súbor"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Zmazať"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Zmazať Ponor"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Zmazať ponor"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Zmazať ponory"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Hĺbka"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Hĺbka (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Prekročená Maximálna Hĺbka"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Hĺbka:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Názov zariadenia"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Ponor #%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Ponor #%d: %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Počítač"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Informácie"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Poznámky"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Čas Ponoru"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Alarm Času Ponoru"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Info: Čas Ponoru"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Počítač"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr "Chyba importu dát"
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Detaily ponoru"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Poznámky"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Divemaster"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Ponor č."
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Font pre ponory"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Ponory"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Miesto"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Nahratie údajov z počítača"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Nahratie údajov z počítača..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Nahratie údajov z počítača"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Nahratie údajov z počítača..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Dĺžka (min)"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Dĺžka (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Editovať"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Názov zariadenia"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Editovať akciu"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Editovať sumár"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Editovať ponor"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Editovať ponor"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Editovať ponory"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Editovať viac ponorov"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Editovať sumár"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Povolit / zakázať udalosti"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Koniec"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, 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."
+msgstr ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Výstroj"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+#, fuzzy
+msgid "Error obtaining water salinity"
+msgstr "Chyba spracovania vzoriek"
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr "Chyba spracovania času"
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr "Chyba spracovania času ponoru"
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr "Chyba spracovania zmesi plynu"
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr "Chyba spracovania dýchacích zmesí"
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr "Chyba spracovania maximálnej hĺbky"
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr "Chyba spracovania vzoriek"
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr "Chyba registrácie správcu ukončenia"
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr "Chyba registrácie dát"
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr "Chyba registrácia správcu udalosti."
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr "Udalosť: systime=%<PRId64>, devtime=%u\n"
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr "Udalosť: Čakanie na vstup uživateľa"
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Expandovať všetky"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Chyba pri otváraní %i súborov"
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Chyba pri spracovaní '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Chyba pri spracovaní '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Chyba pri načítaní '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Chyba pri načítaní '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "Feb"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "stopa"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Súbor"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filter"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "Pi"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Použitá zmes"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Zmes"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Pomoc"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Import XML súboru..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Info"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "Jan"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "Jul"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "Jun"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel a ďalší, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Zoznam"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Miesto"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Najdlhší"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Najdlhší ponor"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Alarm: Slabá batéria"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Upozornenie: Slabá batéria"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "Mar"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "Značka"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "Master"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Upozornenie: Max. dekompresný čas"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Max. hĺbka"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Max. spotreba"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Max. teplota"
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -585,270 +967,341 @@ msgstr ""
 "Dĺžka: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Max. tlak"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "Máj"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Zmazať ponory"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Spoj akciu s akciou nad"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Spoj akciu s akciou pod"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Min. hĺbka"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Min. spotreba"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Min. teplota"
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Rôzne voľby"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "Po"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Multiplatformový SW na správu ponorov v C"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Nový"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Nové začiatočné číslo"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Názov zariadenia"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Žiadne informácie o fľaši"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Poznámky"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "Nov"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr "OLF"
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "Okt"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr "Nešpecifikovaná PTHREAD chyba"
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Otvoriť súbor"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Otvoriť..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr "PO2"
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "PO2 Alarm: Výstup"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "PO2 Upozornenie: Výstup"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "PO2 Upozornenie: Zelená"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Nastavenia..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Tlak"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Tlak:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Pekná tlač"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Tlačiť vybrané ponory"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Tlačiť výber"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Druh tlače"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Tlačiť..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profil"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Koniec"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Alarm: zostávajúci čas plynu"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Upozornenie: zostávajúci čas plynu"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Rating"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Načítavam ponor %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Vymaž akciu"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Vymaž ponor z akcie"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Vymaž vybrané ponory z akcie"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Prečíslovanie"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Prečíslovanie..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Skús znovu"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "Spotreba plynu"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Pridať ponor"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE súbor"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Nedodržaná bezpečnostná zastávka"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "So"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Uložiť zmeny?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Uložiť súbor ako"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Uložiť..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Priemerný čas"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Voľba udalosti"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Voľba udalosti..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "Sep"
 
@@ -860,126 +1313,222 @@ msgstr ""
 "Čiastočný zápis do req.txt súboru\n"
 "Je Uemis Zurich korektne pripojený?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Najkratší"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Najkratší ponor"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Zobraz stĺpce"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Zmazať Ponor"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Veľkosť"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: Rýchlosť"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Upozornenie: Rýchlosť"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Štart"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Štatistika"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Štatistika"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Štatistiky"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Štatistiky"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Oblek"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "Ne"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Povrchový interval"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Tlač tabuľky"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Odporúčaná zmena fľaše"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Info: Tlak vo fľaši"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Teplota"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Teplota"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Teplota:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Kombinovaný"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "Št"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Čas"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Zmeň veľkosť"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Celkový čas"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Celkový čas"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Závažie:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Akcia %1$s, %2$s %3$d, %4$d (%5$d ponor)"
 msgstr[1] "Akcia %1$s, %2$s %3$d, %4$d (%5$d ponorov)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "Ut"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Typ"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Súborovy systém takmer plný\n"
 "Odpoj a znovu pripoj počítač\n"
@@ -995,69 +1544,98 @@ msgstr ""
 "Odpoj a znovu pripoj počítač\n"
 "a skus znovu"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Uemis - inicializácia neúspešná"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr "Problém inicializácie libdivecomputer"
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr "Nie je možné spracovať %s %s"
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Nie je možné otvoriť %s %s (%s)"
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Jednotky"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Náhľad"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Objem:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Teplota vody"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "St"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Závažie"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Závažie"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Závažie:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML súbor"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr "Rok"
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Ročná štatistika"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1065,7 +1643,7 @@ msgstr ""
 "Máš neuložené zmeny.\n"
 "Chceš ich uložiť pred zatvorením súboru?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1074,196 +1652,314 @@ msgstr ""
 "Máš neuložené zmeny v súbore %s \n"
 "Chceš ich uložiť pred zatvorením súboru?"
 
-#: divelist.c:639
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, c-format
 msgid "air"
 msgstr "vzduch"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr "čas na vzduchu"
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "členok"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr "výstup"
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr "backplate závažie"
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "opasok"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr "poznámka"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr "strop"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr "strop (bezpečnostná zastávka)"
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr "cuft"
 
-#: libdivecomputer.c:80
-msgid "deco"
-msgstr "dekompresia"
+#: uemis-downloader.c:384
+msgid "data"
+msgstr ""
+
+#: libdivecomputer.c:149
+#, fuzzy
+msgid "deco stop"
+msgstr "hĺbkový zastávka"
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr "hĺbkový zastávka"
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr "čas ponoru"
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "Jan"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Ponor #%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Tlačiť vybrané ponory"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Tlačiť vybrané ponory"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr "zmena plynu"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr "smer"
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integrované"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr "neplatné číslo udalosti"
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr "l"
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "US libra"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr "m"
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "maxdepth"
 msgstr "max. hĺbka"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, 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)"
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "viac než %d dní"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "viac než %d dní"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr "žiaden"
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr "pascal"
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr "psi"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr "rbt"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr "rgbm"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr "bezpečnostná zastávka"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr "bezpečnostná zastávka (povinná)"
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr "bezpečnostná zastávka (dobrovoľná)"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr "povrch"
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr "upozornenie nasýtenia tkanív"
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr "Jozef Ivanecký"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr "vysielač"
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "nez."
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "neznámy"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "nešpecifikovaný"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "violation"
 msgstr "prekročenie"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "hmotnosť"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr "záťaž"
 
 #~ msgid "About"
 #~ msgstr "Info"
 
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Automatické zrgupovanie do akcii"
+
+#~ msgid "Delete"
+#~ msgstr "Zmazať"
+
 #, fuzzy
 #~ msgctxt "Depth"
 #~ msgid ""
@@ -1282,6 +1978,9 @@ msgstr "záťaž"
 #~ "Dĺžka\n"
 #~ "Celková"
 
+#~ msgid "Pretty print"
+#~ msgstr "Pekná tlač"
+
 #, fuzzy
 #~ msgctxt "SAC"
 #~ msgid ""
@@ -1307,3 +2006,6 @@ msgstr "záťaž"
 #~ msgstr ""
 #~ "Teplota\n"
 #~ "Priemer"
+
+#~ msgid "deco"
+#~ msgstr "dekompresia"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 153631980..676ec288d 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-21 20:59-0700\n"
+"POT-Creation-Date: 2013-02-01 18:08+1100\n"
 "PO-Revision-Date: 2012-10-12 11:48+0900\n"
 "Last-Translator: Linus Torvalds <torvalds@linux-foundation.org>\n"
 "Language-Team: Swedish\n"
@@ -20,562 +20,943 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: statistics.c:162
+#: statistics.c:184
 msgctxt "Stats"
 msgid " > Month"
 msgstr " > Månad"
 
-#: gtk-gui.c:1516
+#: webservice.c:234
+msgid " Download"
+msgstr ""
+
+#: download-dialog.c:375
 msgid " Please select dive computer and device. "
 msgstr " Välj dykdator och enhet"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "#"
 msgstr ""
 
-#: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629
+#: print.c:322
+#, fuzzy, c-format
+msgid "%.*f %s"
+msgstr "%.*f %s/min"
+
+#: print.c:267 print.c:340
+#, fuzzy, c-format
+msgid "%.*f %s\n"
+msgstr "%.*f %s/min"
+
+#: statistics.c:588 statistics.c:735 statistics.c:737 statistics.c:739
 #, c-format
 msgid "%.*f %s/min"
 msgstr "%.*f %s/min"
 
+#: planner.c:540
+#, 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:72
+#: print.c:76
 #, c-format
 msgid "%1$s%2$s, %3$s %4$d, %5$d   %6$d:%7$02d"
 msgstr "%1$s%2$s, %4$d %3$s, %5$d   %6$d:%7$02d"
 
 #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min
-#: print.c:229
+#: print.c:584
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d   %5$dh%6$02d"
 msgstr "%1$s, %3$d %2$s, %4$d   %5$dh%6$02d"
 
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min
-#: divelist.c:385
+#: divelist.c:277
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d"
 msgstr "%1$s, %3$d %2$s, %4$d %5$02d:%6$02d"
 
 #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min
-#: statistics.c:529
+#: statistics.c:551
 #, c-format
 msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d"
 msgstr "%1$s, %3$d %2$s, %4$d %5$2d:%6$02d"
 
-#: print.c:254 statistics.c:536
+#: print.c:609 statistics.c:558
 #, c-format
 msgid "%d min"
 msgstr "%d min"
 
-#: statistics.c:507
+#: statistics.c:528
 #, c-format
 msgid "%dd %dh %dmin"
 msgstr "%dd %dt %dmin"
 
-#: statistics.c:509
+#: statistics.c:530
 #, c-format
 msgid "%dh %dmin"
 msgstr "%dt %dmin"
 
-#: dive.c:618
+#: print.c:318
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: profile.c:2144
+#, c-format
+msgid ""
+"%s\n"
+"CNS:%u%%"
+msgstr ""
+
+#: profile.c:2112
+#, c-format
+msgid ""
+"%s\n"
+"Calculated ceiling %.0f %s"
+msgstr ""
+
+#: profile.c:2128
+#, c-format
+msgid ""
+"%s\n"
+"Deco:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2131
+#, c-format
+msgid ""
+"%s\n"
+"Deco:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2168
+#, c-format
+msgid ""
+"%s\n"
+"EAD:%d%s\n"
+"END:%d%s\n"
+"EADD:%d%s"
+msgstr ""
+
+#: profile.c:2137
+#, c-format
+msgid ""
+"%s\n"
+"In deco"
+msgstr ""
+
+#: profile.c:2161
+#, c-format
+msgid ""
+"%s\n"
+"MOD:%d%s"
+msgstr ""
+
+#: profile.c:2140
+#, c-format
+msgid ""
+"%s\n"
+"NDL:%umin"
+msgstr ""
+
+#: profile.c:2102
+#, c-format
+msgid ""
+"%s\n"
+"P:%d %s"
+msgstr ""
+
+#: profile.c:2120
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:%umin @ %.0f %s"
+msgstr ""
+
+#: profile.c:2123
+#, c-format
+msgid ""
+"%s\n"
+"Safetystop:unkn time @ %.0f %s"
+msgstr ""
+
+#: profile.c:2107
+#, c-format
+msgid ""
+"%s\n"
+"T:%.1f %s"
+msgstr ""
+
+#: profile.c:2156
+#, c-format
+msgid ""
+"%s\n"
+"pHe:%.2fbar"
+msgstr ""
+
+#: profile.c:2152
+#, c-format
+msgid ""
+"%s\n"
+"pN%s:%.2fbar"
+msgstr ""
+
+#: profile.c:2148
+#, c-format
+msgid ""
+"%s\n"
+"pO%s:%.2fbar"
+msgstr ""
+
+#: dive.c:762
 #, c-format
 msgid "(%s) or (%s)"
 msgstr "(%s) eller (%s)"
 
-#: gtk-gui.c:851 gtk-gui.c:923
+#: statistics.c:680
+#, fuzzy, c-format
+msgid "(no dives)"
+msgstr "Redigera dyk"
+
+#: gtk-gui.c:1995
+msgid "(nothing)"
+msgstr ""
+
+#: planner.c:1226
+msgid "0.6 cuft/min"
+msgstr ""
+
+#: planner.c:1225
+msgid "0.7 cuft/min"
+msgstr ""
+
+#: print.c:907
+msgid "1 dive per page"
+msgstr ""
+
+#: planner.c:1231
+msgid "17 l/min"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "2 pcs full suit"
+msgstr ""
+
+#: planner.c:1230
+msgid "20 l/min"
+msgstr ""
+
+#: gtk-gui.c:833
+msgid "3m increments for calculated ceiling"
+msgstr ""
+
+#: print.c:903
+msgid "6 dives per page"
+msgstr ""
+
+#: planner.c:1203
+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>"
+msgstr ""
+
+#: planner.c:1113
+msgid "AIR"
+msgstr ""
+
+#: gtk-gui.c:1054 gtk-gui.c:1377
 msgid "About Subsurface"
 msgstr ""
 
-#: gtk-gui.c:917
+#: gtk-gui.c:1368
 msgid "Add Dive..."
 msgstr "Nytt dyk..."
 
-#: divelist.c:2023
+#: divelist.c:2364
 msgid "Add dive"
 msgstr "Nytt dyk"
 
-#: divelist.c:2102
+#: divelist.c:2462
 msgid "Add to trip above"
 msgstr "Kombinera med resan ovan"
 
-#: main.c:46
+#: planner.c:1250
+msgid "Add waypoint"
+msgstr ""
+
+#: statistics.c:845
+msgid "Air Press"
+msgstr ""
+
+#: statistics.c:844
+#, fuzzy
+msgid "Air Temp"
+msgstr "Medel-temp."
+
+#: info.c:714
+#, c-format
+msgid "Air Temp in %s"
+msgstr ""
+
+#: download-dialog.c:391
+msgid "Always prefer downloaded dive"
+msgstr ""
+
+#: main.c:71
 msgid "Apr"
 msgstr "apr"
 
-#: main.c:47
+#: main.c:72
 msgid "Aug"
 msgstr "aug"
 
-#: gtk-gui.c:932
+#: gtk-gui.c:1390
 msgid "Autogroup"
 msgstr "Gruppera automatiskt"
 
-#: gtk-gui.c:664
-msgid "Automatically group dives in trips"
-msgstr "Gruppera dyk som resor automatisk"
-
-#: statistics.c:168
+#: statistics.c:190
 msgctxt "Depth"
 msgid "Average"
 msgstr "Genomsnitt"
 
-#: statistics.c:165
+#: statistics.c:187
 msgctxt "Duration"
 msgid "Average"
 msgstr "Genomsnitt"
 
-#: statistics.c:171
+#: statistics.c:193
 msgctxt "SAC"
 msgid "Average"
 msgstr "Genomsnitt"
 
-#: statistics.c:174
+#: statistics.c:196
 msgctxt "Temp"
 msgid "Average"
 msgstr "Genomsnitt"
 
-#: statistics.c:692 statistics.c:729
+#: statistics.c:799 statistics.c:836
 msgid "Avg Depth"
 msgstr "Medeldjup"
 
-#: statistics.c:700
+#: statistics.c:807
 msgid "Avg SAC"
 msgstr "Medel-SAC"
 
-#: statistics.c:675
+#: statistics.c:782
 msgid "Avg Temp"
 msgstr "Medel-temp."
 
-#: statistics.c:682
+#: statistics.c:789
 msgid "Avg Time"
 msgstr "Medel-tid"
 
-#: gtk-gui.c:592
+#: gtk-gui.c:634
 msgid "Bar"
 msgstr "bar"
 
-#: info.c:515 info.c:942 print.c:156
+#: info.c:700 info.c:1153 print.c:511
 msgid "Buddy"
 msgstr "Buddy"
 
-#: gtk-gui.c:602
+#: planner.c:1142
+msgid "CC SetPoint"
+msgstr ""
+
+#: uemis-downloader.c:908
+msgid "Cancelled, exiting cleanly..."
+msgstr ""
+
+#: libdivecomputer.c:756
+msgid "Cancelled..."
+msgstr ""
+
+#: webservice.c:27
+msgid "Cannot parse response!"
+msgstr ""
+
+#: gtk-gui.c:644
 msgid "Celsius"
 msgstr "Celsius"
 
-#: gtk-gui.c:522
+#: gtk-gui.c:556
 msgid "Choose Default XML File"
 msgstr "Välj standard XML-fil"
 
-#: gtk-gui.c:1410
+#: gtk-gui.c:1896
 msgid "Choose XML Files To Import Into Current Data File"
 msgstr "Välj vilka XML-filer du vill importera"
 
-#: gtk-gui.c:913
+#: gtk-gui.c:1363
 msgid "Close"
 msgstr "Stäng"
 
-#: divelist.c:2119
+#: divelist.c:2480
 msgid "Collapse all"
 msgstr "Sammanslå alla"
 
-#: divelist.c:2092
+#: webservice.c:119
+msgid "Connecting..."
+msgstr ""
+
+#: webservice.c:23
+msgid "Connection Error: "
+msgstr ""
+
+#: divelist.c:2452
 msgid "Create new trip above"
 msgstr "Ny resa innan"
 
-#: gtk-gui.c:598
+#: gtk-gui.c:640
 msgid "CuFt"
 msgstr "ft^3"
 
-#: divelist.c:1269 gtk-gui.c:622
+#: divelist.c:1423 gtk-gui.c:664
 msgid "Cyl"
 msgstr "Cyl"
 
-#: equipment.c:934 equipment.c:1070
+#: equipment.c:918 equipment.c:1029 print.c:205
 msgid "Cylinder"
 msgstr "Cylinder"
 
-#: equipment.c:1580
+#: equipment.c:1539
 msgid "Cylinders"
 msgstr "Cylindrar"
 
-#: divelist.c:1262 print.c:155 statistics.c:720
+#: profile.c:2098
+#, fuzzy, c-format
+msgid "D:%.1f %s"
+msgstr "%.*f %s/min"
+
+#: divelist.c:1416 print.c:510 statistics.c:827
 msgid "Date"
 msgstr "Datum"
 
-#: info.c:807
+#: info.c:1001
 msgid "Date and Time"
 msgstr "Datum och tid"
 
-#: info.c:817
+#: info.c:1011
 msgid "Date:"
 msgstr "Datum:"
 
-#: main.c:47
+#: main.c:72
 msgid "Dec"
 msgstr "dec"
 
-#: gtk-gui.c:669
+#: gtk-gui.c:701
 msgid "Default XML Data File"
 msgstr "Standard XML-fil"
 
-#: info.c:256
-msgid "Delete"
-msgstr "Radera"
-
-#: info.c:207
-msgid "Delete Dive"
-msgstr "Radera dyk"
+#: gtk-gui.c:1310
+msgid "Delete a dive computer information entry"
+msgstr ""
 
-#: divelist.c:2010
+#: divelist.c:2206 divelist.c:2259 divelist.c:2351
 msgid "Delete dive"
 msgstr "Radera dyk"
 
-#: divelist.c:2009
+#: divelist.c:2208 divelist.c:2350
 msgid "Delete dives"
 msgstr "Radera dyk"
 
-#: print.c:155 statistics.c:160
+#: print.c:510 statistics.c:182
 msgid "Depth"
 msgstr "Djup"
 
-#: info.c:867
+#: info.c:1078
 #, c-format
 msgid "Depth (%s):"
 msgstr "Djup (%s):"
 
-#: uemis.c:161
+#: uemis.c:222
 msgid "Depth Limit Exceeded"
 msgstr "Maxdjup överskridits"
 
-#: gtk-gui.c:586
+#: gtk-gui.c:628
 msgid "Depth:"
 msgstr "Djup:"
 
-#: gtk-gui.c:1378
-msgid "Device name"
+#: gtk-gui.c:1269
+#, fuzzy
+msgid "Device Id"
 msgstr "Enhetsnamn"
 
+#: download-dialog.c:330
+msgid "Device or mount point"
+msgstr ""
+
 #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min
-#: info.c:107
+#: info.c:105
 #, c-format
 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:159 print.c:67
+#: info.c:157 print.c:71
 #, c-format
 msgid "Dive #%d - "
 msgstr "Dyk #%d - "
 
-#: libdivecomputer.c:254
+#: libdivecomputer.c:435
 #, c-format
 msgid "Dive %d: %s %d %04d"
 msgstr "Dyk #%d: %s %d %04d"
 
-#: gtk-gui.c:1134 info.c:700 statistics.c:711
+#: gtk-gui.c:1977
+#, fuzzy
+msgid "Dive Computer Nickname"
+msgstr "Dykdator"
+
+#: gtk-gui.c:1607 info.c:898 statistics.c:818
 msgid "Dive Info"
 msgstr "Information"
 
-#: gtk-gui.c:1126
+#: gtk-gui.c:1599
 msgid "Dive Notes"
 msgstr "Dykanteckningar"
 
-#: statistics.c:721
+#: planner.c:1194
+msgid "Dive Plan - THIS IS JUST A SIMULATION; DO NOT USE FOR DIVING"
+msgstr ""
+
+#: statistics.c:828
 msgid "Dive Time"
 msgstr "Dyktid"
 
-#: uemis.c:167
+#: uemis.c:228
 msgid "Dive Time Alert"
 msgstr "Dyktidsvarning"
 
-#: uemis.c:165
+#: uemis.c:226
 msgid "Dive Time Info"
 msgstr "Dyktidsnot"
 
-#: gtk-gui.c:1347
-msgid "Dive computer"
-msgstr "Dykdator"
+#: download-dialog.c:288
+msgid "Dive computer vendor and product"
+msgstr ""
 
-#: libdivecomputer.c:373
+#: libdivecomputer.c:680
 msgid "Dive data import error"
 msgstr ""
 
-#: print.c:476
+#: print.c:893
 msgid "Dive details"
 msgstr "Detaljer"
 
-#: info.c:514
+#: gps.c:193
+#, fuzzy
+msgid "Dive locations"
+msgstr "Dykanteckningar"
+
+#: info.c:699
 msgid "Dive master"
 msgstr "Divemaster"
 
-#: print.c:155
+#: planner.c:1219
+msgid "Dive starts when?"
+msgstr ""
+
+#: print.c:510
 msgid "Dive#"
 msgstr "Dyknr"
 
-#: gtk-gui.c:652
+#: gtk-gui.c:689
 msgid "Divelist Font"
 msgstr "Font för dyklistan"
 
-#: info.c:941
+#: info.c:1152
 msgid "Divemaster"
 msgstr "Divemaster"
 
-#: statistics.c:672
+#: statistics.c:779
 msgid "Dives"
 msgstr "Dyk"
 
-#: gtk-gui.c:1508
+#: gtk-gui.c:1373
+#, fuzzy
+msgid "Dives Locations"
+msgstr "Plats"
+
+#: download-dialog.c:366
 msgid "Download From Dive Computer"
 msgstr "Ladda ned från dykdator"
 
-#: gtk-gui.c:916
+#: gtk-gui.c:1366
 msgid "Download From Dive Computer..."
 msgstr "Ladda ned från dykdator..."
 
-#: statistics.c:160
+#: webservice.c:207
+#, fuzzy
+msgid "Download From Web Service"
+msgstr "Ladda ned från dykdator"
+
+#: gtk-gui.c:1367
+#, fuzzy
+msgid "Download From Web Service..."
+msgstr "Ladda ned från dykdator..."
+
+#: webservice.c:29
+msgid "Download Success!"
+msgstr ""
+
+#: statistics.c:182
 msgid "Duration"
 msgstr "Varaktighet"
 
-#: info.c:862
+#: info.c:1073
 msgid "Duration (min)"
 msgstr "Varaktighet (min)"
 
-#: info.c:257
+#: info.c:629
+msgid "E"
+msgstr ""
+
+#: planner.c:76
+#, c-format
+msgid "EAN%d"
+msgstr ""
+
+#: planner.c:1114
+msgid "EAN32"
+msgstr ""
+
+#: planner.c:1115
+msgid "EAN36"
+msgstr ""
+
+#: info.c:222
 msgid "Edit"
 msgstr "Redigera"
 
-#: info.c:659
+#: gtk-gui.c:1382
+#, fuzzy
+msgid "Edit Device Names"
+msgstr "Enhetsnamn"
+
+#: gtk-gui.c:1242
+msgid "Edit Dive Computer Nicknames"
+msgstr ""
+
+#: info.c:857
 msgid "Edit Trip Info"
 msgstr "Redigera reseinformation"
 
-#: divelist.c:2031
+#: divelist.c:2372
 msgid "Edit Trip Summary"
 msgstr "Redigera resesammandrag"
 
-#: divelist.c:2007
+#: gtk-gui.c:1302
+msgid ""
+"Edit a dive computer nickname by double-clicking the in the relevant "
+"nickname field"
+msgstr ""
+
+#: divelist.c:2348
 msgid "Edit dive"
 msgstr "Redigera dyk"
 
-#: divelist.c:2006
+#: divelist.c:2405 divelist.c:2424
+#, fuzzy
+msgid "Edit dive date/time"
+msgstr "Redigera dyk"
+
+#: divelist.c:2347
 msgid "Edit dives"
 msgstr "Redigera dyk"
 
-#: info.c:502
+#: info.c:669
 msgid "Edit multiple dives"
 msgstr "Redigera flera dyk"
 
-#: info.c:482
+#: info.c:601
 msgid "Edit trip summary"
 msgstr "Redigera resesammandrag"
 
-#: gtk-gui.c:773
+#: gtk-gui.c:953
 msgid "Enable / Disable Events"
 msgstr "Aktivera / Inaktivera händelser"
 
-#: equipment.c:973 equipment.c:1497
+#: equipment.c:949 equipment.c:1456
 msgid "End"
 msgstr "Slut"
 
-#: gtk-gui.c:1130 info.c:535
+#: planner.c:1139
+#, fuzzy
+msgid "Ending Depth"
+msgstr "Min. djup"
+
+#: 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 ""
+
+#: gtk-gui.c:1603 info.c:733
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: libdivecomputer.c:240
+#: libdivecomputer.c:470
+msgid "Error obtaining water salinity"
+msgstr ""
+
+#: libdivecomputer.c:418
 msgid "Error parsing the datetime"
 msgstr ""
 
-#: libdivecomputer.c:259
+#: libdivecomputer.c:440
 msgid "Error parsing the divetime"
 msgstr ""
 
-#: libdivecomputer.c:286
+#: libdivecomputer.c:479
 msgid "Error parsing the gas mix"
 msgstr ""
 
-#: libdivecomputer.c:279
+#: libdivecomputer.c:460
 msgid "Error parsing the gas mix count"
 msgstr ""
 
-#: libdivecomputer.c:269
+#: libdivecomputer.c:450
 msgid "Error parsing the maxdepth"
 msgstr ""
 
-#: libdivecomputer.c:294
+#: libdivecomputer.c:487
 msgid "Error parsing the samples"
 msgstr ""
 
-#: libdivecomputer.c:369
+#: libdivecomputer.c:676
 msgid "Error registering the cancellation handler."
 msgstr ""
 
-#: libdivecomputer.c:231
+#: libdivecomputer.c:409
 msgid "Error registering the data"
 msgstr ""
 
-#: libdivecomputer.c:364
+#: libdivecomputer.c:671
 msgid "Error registering the event handler."
 msgstr ""
 
-#: libdivecomputer.c:339
+#: libdivecomputer.c:644
 #, c-format
 msgid "Event: systime=%<PRId64>, devtime=%u\n"
 msgstr ""
 
-#: libdivecomputer.c:325
+#: libdivecomputer.c:621
 msgid "Event: waiting for user action"
 msgstr ""
 
-#: divelist.c:2116
+#: divelist.c:2476
 msgid "Expand all"
 msgstr "Expandera alla"
 
-#: gtk-gui.c:603
+#: gtk-gui.c:645
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
-#: gtk-gui.c:140
+#: gtk-gui.c:112
 #, c-format
 msgid "Failed to open %i files."
 msgstr "Kunde inte öppna %i filer."
 
-#: parse-xml.c:1498
+#: parse-xml.c:1448
 #, c-format
 msgid "Failed to parse '%s'"
 msgstr "Kunde inte läsa '%s'"
 
-#: parse-xml.c:1493
+#: parse-xml.c:1443
 #, c-format
 msgid "Failed to parse '%s'.\n"
 msgstr "Kunde inte läsa '%s'.\n"
 
-#: file.c:266
+#: file.c:265
 #, c-format
 msgid "Failed to read '%s'"
 msgstr "Kunde inte öppna '%s'"
 
-#: file.c:262
+#: file.c:261
 #, c-format
 msgid "Failed to read '%s'.\n"
 msgstr "Kunde inte öppna '%s'.\n"
 
-#: main.c:46
+#: main.c:71
 msgid "Feb"
 msgstr "feb"
 
-#: gtk-gui.c:588
+#: gtk-gui.c:630
 msgid "Feet"
 msgstr "fot"
 
-#: gtk-gui.c:904
+#: gtk-gui.c:1353
 msgid "File"
 msgstr "Fil"
 
-#: gtk-gui.c:907
+#: gtk-gui.c:1356
 msgid "Filter"
 msgstr "Filter"
 
-#: main.c:37
+#: download-dialog.c:385
+msgid "Force download of all dives"
+msgstr ""
+
+#: main.c:62
 msgid "Fri"
 msgstr "fre"
 
-#: statistics.c:739
+#: gtk-gui.c:851
+msgid "GFhigh"
+msgstr ""
+
+#: planner.c:1242
+msgid "GFhigh for plan"
+msgstr ""
+
+#: gtk-gui.c:841
+msgid "GFlow"
+msgstr ""
+
+#: planner.c:1241
+msgid "GFlow for plan"
+msgstr ""
+
+#: info.c:683
+msgid "GPS (WGS84 or GPS format)"
+msgstr ""
+
+#: planner.c:1141 print.c:205 statistics.c:854
 msgid "Gas Used"
 msgstr "Gasanvändning"
 
-#: equipment.c:983
+#: planner.c:529
+#, c-format
+msgid "Gas consumption:\n"
+msgstr ""
+
+#: equipment.c:959 print.c:205
 msgid "Gasmix"
 msgstr "Gasmix"
 
-#: gtk-gui.c:908
+#: gtk-gui.c:621
+msgid "General Settings"
+msgstr ""
+
+#: gtk-gui.c:1358
 msgid "Help"
 msgstr "Hjälp"
 
-#: gtk-gui.c:915
+#: webservice.c:241
+msgid "Idle"
+msgstr ""
+
+#: gtk-gui.c:1365
 msgid "Import XML File(s)..."
 msgstr "Importera XML-fil(er)..."
 
-#: gtk-gui.c:926
+#: gtk-gui.c:1380
 msgid "Info"
 msgstr "Info"
 
+#: uemis-downloader.c:761
+msgid "Init Communication"
+msgstr ""
+
+#: gtk-gui.c:1385
+msgid "Input Plan"
+msgstr ""
+
+#: webservice.c:25
+msgid "Invalid user identifier!"
+msgstr ""
+
 #. ++GETTEXT: these are three letter months - we allow up to six code bytes
-#: main.c:46
+#: main.c:71
 msgid "Jan"
 msgstr "jan"
 
-#: main.c:47
+#: main.c:72
 msgid "Jul"
 msgstr "jul"
 
-#: main.c:46
+#: main.c:71
 msgid "Jun"
 msgstr "jun"
 
-#: gtk-gui.c:857
-msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"
+#: gtk-gui.c:1060
+#, fuzzy
+msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013"
 msgstr "Linus Torvalds, Dirk Hohndel med flera, 2011, 2012"
 
-#: gtk-gui.c:924
+#: gtk-gui.c:1378
 msgid "List"
 msgstr "Lista"
 
-#: gtk-gui.c:597
+#: gtk-gui.c:639
 msgid "Liter"
 msgstr "liter"
 
-#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156
+#: divelist.c:1428 info.c:606 info.c:676 info.c:1147 print.c:511
 msgid "Location"
 msgstr "Plats"
 
-#: gtk-gui.c:905
+#: gtk-gui.c:1354
 msgid "Log"
 msgstr "Log"
 
-#: statistics.c:167
+#: statistics.c:189
 msgctxt "Duration"
 msgid "Longest"
 msgstr "Längsta"
 
-#: statistics.c:683
+#: statistics.c:790
 msgid "Longest Dive"
 msgstr "Längsta dyk"
 
-#: uemis.c:175
+#: uemis.c:236
 msgid "Low Battery Alert"
 msgstr "Varning: lågt batteri"
 
-#: uemis.c:173
+#: uemis.c:234
 msgid "Low Battery Warning"
 msgstr "Varning: lågt batteri"
 
-#: main.c:46
+#: main.c:71
 msgid "Mar"
 msgstr "mar"
 
-#: uemis.c:169
+#: gps.c:56
+msgid "Mark location here"
+msgstr ""
+
+#: uemis.c:230
 msgid "Marker"
 msgstr "markering"
 
-#: print.c:155
+#: print.c:510
 msgid "Master"
 msgstr "master"
 
-#: uemis.c:163
+#: uemis.c:224
 msgid "Max Deco Time Warning"
 msgstr "Varning: max dekotid"
 
-#: statistics.c:690 statistics.c:728
+#: statistics.c:797 statistics.c:835
 msgid "Max Depth"
 msgstr "Maxdjup"
 
-#: statistics.c:698
+#: statistics.c:805
 msgid "Max SAC"
 msgstr "Max SAC"
 
-#: statistics.c:673
+#: statistics.c:780
 msgid "Max Temp"
 msgstr "Max temp"
 
-#: print.c:95
+#: print.c:103
 #, c-format
 msgid ""
 "Max depth: %.*f %s\n"
@@ -586,270 +967,341 @@ msgstr ""
 "Tid: %d min\n"
 "%s"
 
-#: equipment.c:1495
+#: print.c:385
+#, c-format
+msgid "Max. CNS"
+msgstr ""
+
+#: equipment.c:1454
 msgid "MaxPress"
 msgstr "Max tryck"
 
-#: statistics.c:170
+#: statistics.c:192
 msgctxt "Depth"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:173
+#: statistics.c:195
 msgctxt "SAC"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: statistics.c:176
+#: statistics.c:198
 msgctxt "Temp"
 msgid "Maximum"
 msgstr "Maximum"
 
-#: main.c:46
+#: main.c:71
 msgid "May"
 msgstr "maj"
 
-#: divelist.c:2039
+#: divelist.c:2339
+#, fuzzy
+msgid "Merge dives"
+msgstr "Radera dyk"
+
+#: divelist.c:2380
 msgid "Merge trip with trip above"
 msgstr "Sammanfoga resa med tidigare resa"
 
-#: divelist.c:2049
+#: divelist.c:2390
 msgid "Merge trip with trip below"
 msgstr "Sammanfoga resa med senare resa"
 
-#: gtk-gui.c:587
+#: gtk-gui.c:629
 msgid "Meter"
 msgstr "meter"
 
-#: statistics.c:691
+#: statistics.c:798
 msgid "Min Depth"
 msgstr "Min. djup"
 
-#: statistics.c:699
+#: statistics.c:806
 msgid "Min SAC"
 msgstr "Min. SAC"
 
-#: statistics.c:674
+#: statistics.c:781
 msgid "Min Temp"
 msgstr "Min. temp"
 
-#: statistics.c:169
+#: statistics.c:191
 msgctxt "Depth"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:172
+#: statistics.c:194
 msgctxt "SAC"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: statistics.c:175
+#: statistics.c:197
 msgctxt "Temp"
 msgid "Minimum"
 msgstr "Minimum"
 
-#: gtk-gui.c:658
+#: gtk-gui.c:695
 msgid "Misc. Options"
 msgstr "Diverse inställningar"
 
-#: main.c:37
+#: gtk-gui.c:1264
+msgid "Model"
+msgstr ""
+
+#: main.c:62
 msgid "Mon"
 msgstr "mån"
 
-#: gtk-gui.c:853
+#: gtk-gui.c:1056
 msgid "Multi-platform divelog software in C"
 msgstr "Dyklogg i C for flera platformer"
 
-#: gtk-gui.c:909
+#: info.c:628
+msgid "N"
+msgstr ""
+
+#: gtk-gui.c:1359
 msgid "New"
 msgstr "Ny"
 
-#: gtk-gui.c:813
+#: gtk-gui.c:1004
 msgid "New starting number"
 msgstr "Nytt startnummer"
 
-#: uemis.c:171
+#: gtk-gui.c:1384
+msgid "Next DC"
+msgstr ""
+
+#: gtk-gui.c:1274 gtk-gui.c:1999
+#, fuzzy
+msgid "Nickname"
+msgstr "Enhetsnamn"
+
+#: uemis.c:232
 msgid "No Tank Data"
 msgstr "Ingen tankinformation"
 
-#: info.c:492 info.c:527 info.c:950
+#: info.c:611 info.c:725 info.c:1161
 msgid "Notes"
 msgstr "Anteckningar"
 
-#: main.c:47
+#: main.c:72
 msgid "Nov"
 msgstr "nov"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "OLF"
 msgstr ""
 
-#: divelist.c:1272 gtk-gui.c:637 statistics.c:737
+#: divelist.c:1426 gtk-gui.c:722 print.c:363 statistics.c:852
+#, c-format
 msgid "OTU"
 msgstr "OTU"
 
-#: main.c:47
+#: main.c:72
 msgid "Oct"
 msgstr "okt"
 
-#: libdivecomputer.c:427
+#: libdivecomputer.c:769
 msgid "Odd pthread error return"
 msgstr ""
 
-#: gtk-gui.c:315
+#: gtk-gui.c:1321
+msgid "Ok to delete the selected entry?"
+msgstr ""
+
+#: gtk-gui.c:268
 msgid "Open File"
 msgstr "Öppna fil"
 
-#: gtk-gui.c:910
+#: gtk-gui.c:1360
 msgid "Open..."
 msgstr "Öppna..."
 
-#: libdivecomputer.c:84
+#: print.c:178
+#, c-format
+msgid "Oxygen"
+msgstr ""
+
+#: libdivecomputer.c:153
 msgid "PO2"
 msgstr ""
 
-#: uemis.c:149
+#: uemis.c:210
 msgid "PO2 Ascend Alarm"
 msgstr "Alarm: uppstigning / PO2"
 
-#: uemis.c:147
+#: uemis.c:208
 msgid "PO2 Ascend Warning"
 msgstr "Varning: uppstigning / PO2"
 
-#: uemis.c:144
+#: uemis.c:205
 msgid "PO2 Green Warning"
 msgstr "Varning: grön PO2"
 
-#: gtk-gui.c:593
+#: gtk-gui.c:635
 msgid "PSI"
 msgstr "psi"
 
-#: gtk-gui.c:572
+#: info.c:686
+msgid "Pick on map"
+msgstr ""
+
+#: gtk-gui.c:1357
+msgid "Planner"
+msgstr ""
+
+#: gtk-gui.c:606
 msgid "Preferences"
 msgstr "Optioner"
 
-#: gtk-gui.c:918
+#: gtk-gui.c:1369
 msgid "Preferences..."
 msgstr "Optioner..."
 
-#: equipment.c:962 equipment.c:968
+#: equipment.c:938 equipment.c:944
 msgid "Pressure"
 msgstr "Tryck"
 
-#: gtk-gui.c:591
+#: gtk-gui.c:633
 msgid "Pressure:"
 msgstr "Tryck:"
 
-#: print.c:486
-msgid "Pretty print"
-msgstr "Prydlig utskrift"
+#: gtk-gui.c:1383
+msgid "Prev DC"
+msgstr ""
 
-#: print.c:507
+#: print.c:930
 msgid "Print only selected dives"
 msgstr "Skriv ut valda dyk"
 
-#: print.c:502
+#: print.c:925
 msgid "Print selection"
 msgstr "Skriv ut valda dyk"
 
-#: print.c:480
+#: print.c:897
 msgid "Print type"
 msgstr "Utskriftstyp"
 
-#: gtk-gui.c:914
+#: gtk-gui.c:1364
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: gtk-gui.c:925
+#: gtk-gui.c:1379
 msgid "Profile"
 msgstr "Profil"
 
-#: gtk-gui.c:922
+#: gtk-gui.c:732
+#, fuzzy
+msgid "Profile Settings"
+msgstr "Profil"
+
+#: gtk-gui.c:1376
 msgid "Quit"
 msgstr "Avsluta"
 
-#: uemis.c:157
+#: uemis.c:218
 msgid "RGT Alert"
 msgstr "Varning: gastid"
 
-#: uemis.c:155
+#: uemis.c:216
 msgid "RGT Warning"
 msgstr "Varning: gastid"
 
-#: info.c:520 info.c:947
+#: info.c:705 info.c:1158
 msgid "Rating"
 msgstr "Ranking"
 
-#: uemis-downloader.c:267
-#, c-format
-msgid "Reading dive %s"
+#: uemis-downloader.c:364
+#, fuzzy, c-format
+msgid "Reading %s %s"
 msgstr "Läser dyk %s"
 
-#: divelist.c:2054
+#: divelist.c:2051 divelist.c:2395
 msgid "Remove Trip"
 msgstr "Radera resa"
 
-#: divelist.c:2110
+#: divelist.c:2470
 msgid "Remove dive from trip"
 msgstr "Ta bort dyk från resa"
 
-#: divelist.c:2108
+#: divelist.c:2468
 msgid "Remove selected dives from trip"
 msgstr "Ta bort valda dyk från resa"
 
-#: gtk-gui.c:804
+#: gtk-gui.c:995
 msgid "Renumber"
 msgstr "Uppdatera numrering"
 
-#: gtk-gui.c:919
+#: gtk-gui.c:1370
 msgid "Renumber..."
 msgstr "Uppdatera numrering..."
 
-#: gtk-gui.c:1485
+#: download-dialog.c:141
 msgid "Retry"
 msgstr "Pröva igen"
 
-#: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736
+#: info.c:628
+msgid "S"
+msgstr ""
+
+#: divelist.c:1425 gtk-gui.c:674 print.c:410 statistics.c:182 statistics.c:851
+#, c-format
 msgid "SAC"
 msgstr "SAC"
 
+#: planner.c:1236
+msgid "SAC during decostop"
+msgstr ""
+
+#: planner.c:1235
+#, fuzzy
+msgid "SAC during dive"
+msgstr "Nytt dyk"
+
 #: file.c:75
 msgid "SDE file"
 msgstr "SDE-fil"
 
-#: uemis.c:137
+#: uemis.c:198
 msgid "Safety Stop Violation"
 msgstr "Säkerhetsstopp ej uppfyllt"
 
-#: main.c:37
+#: main.c:62
 msgid "Sat"
 msgstr "lör"
 
-#: gtk-gui.c:912
+#: gtk-gui.c:1362
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: gtk-gui.c:228
+#: gtk-gui.c:198
 msgid "Save Changes?"
 msgstr "Spara ändringar?"
 
-#: gtk-gui.c:165
+#: gtk-gui.c:135
 msgid "Save File As"
 msgstr "Spara fil som"
 
-#: gtk-gui.c:911
+#: gtk-gui.c:1361
 msgid "Save..."
 msgstr "Spara..."
 
-#: gtk-gui.c:764
-msgid "SelectEvents"
+#: planner.c:1140
+#, fuzzy
+msgid "Segment Time"
+msgstr "Medel-tid"
+
+#: gtk-gui.c:944
+#, fuzzy
+msgid "Select Events"
 msgstr "Välj händelser"
 
-#: gtk-gui.c:921
-msgid "SelectEvents..."
+#: gtk-gui.c:1375
+#, fuzzy
+msgid "Select Events..."
 msgstr "Välj händelser..."
 
-#: main.c:47
+#: main.c:72
 msgid "Sep"
 msgstr "sep"
 
@@ -861,126 +1313,222 @@ msgstr ""
 "Kunde inte skriva filen req.txt\n"
 "Är Uemis Zurich ordentligt ansluten?"
 
-#: statistics.c:166
+#: statistics.c:188
 msgctxt "Duration"
 msgid "Shortest"
 msgstr "Kortaste"
 
-#: statistics.c:684
+#: statistics.c:791
 msgid "Shortest Dive"
 msgstr "Kortaste dyk"
 
-#: gtk-gui.c:611
+#: gtk-gui.c:653 gtk-gui.c:716
 msgid "Show Columns"
 msgstr "Visa kolumner"
 
-#: equipment.c:959 equipment.c:1494
+#: gtk-gui.c:812
+msgid "Show EAD, END, EADD"
+msgstr ""
+
+#: gtk-gui.c:795
+msgid "Show MOD"
+msgstr ""
+
+#: gtk-gui.c:828
+msgid "Show calculated ceiling"
+msgstr ""
+
+#: gtk-gui.c:820
+msgid "Show dc reported ceiling in red"
+msgstr ""
+
+#: divelist.c:2441
+msgid "Show in map"
+msgstr ""
+
+#: gtk-gui.c:778
+msgid "Show pHe graph"
+msgstr ""
+
+#: gtk-gui.c:759
+#, c-format
+msgid "Show pN%s graph"
+msgstr ""
+
+#: gtk-gui.c:740
+#, c-format
+msgid "Show pO%s graph"
+msgstr ""
+
+#: planner.c:191
+#, fuzzy
+msgid "Simulated Dive"
+msgstr "Radera dyk"
+
+#: equipment.c:935 equipment.c:1453
 msgid "Size"
 msgstr "Storlek"
 
-#: uemis.c:139
+#: uemis.c:200
 msgid "Speed Alarm"
 msgstr "Alarm: uppstigningshastighet"
 
-#: uemis.c:142
+#: uemis.c:203
 msgid "Speed Warning"
 msgstr "Varning: uppstigningshastighet"
 
-#: equipment.c:970 equipment.c:1496
+#: equipment.c:946 equipment.c:1455
 msgid "Start"
 msgstr "Start"
 
-#: statistics.c:664
+#: uemis-downloader.c:774
+msgid "Start download"
+msgstr ""
+
+#: statistics.c:769
 msgid "Statistics"
 msgstr "Statistik"
 
-#: gtk-gui.c:1138
+#: statistics.c:705
+#, fuzzy, c-format
+msgid "Statistics %s"
+msgstr "Statistik"
+
+#: gtk-gui.c:1611
 msgid "Stats"
 msgstr "Statistik"
 
-#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948
+#: webservice.c:240
+#, fuzzy
+msgid "Status"
+msgstr "Statistik"
+
+#: planner.c:511
+#, 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
 msgid "Suit"
 msgstr "Dräkt"
 
 #. ++GETTEXT: these are three letter days - we allow up to six code bytes
-#: main.c:37
+#: main.c:62
 msgid "Sun"
 msgstr "sön"
 
-#: statistics.c:722
+#: statistics.c:829
 msgid "Surf Intv"
 msgstr "Ytintervall"
 
-#: print.c:490
+#: planner.c:1220
+msgid "Surface Pressure (mbar)"
+msgstr ""
+
+#: planner.c:521
+#, c-format
+msgid "Switch gas to %s\n"
+msgstr ""
+
+#: print.c:911
 msgid "Table print"
 msgstr "Tabellutskrift"
 
-#: uemis.c:159
+#: uemis.c:220
 msgid "Tank Change Suggested"
 msgstr "Tankbyte rekommenderat"
 
-#: uemis.c:153
+#: uemis.c:214
 msgid "Tank Pressure Info"
 msgstr "Info: cylindertryck"
 
-#: gtk-gui.c:617
+#: gtk-gui.c:714
+msgid "Tec Settings"
+msgstr ""
+
+#: gtk-gui.c:659
 msgid "Temp"
 msgstr "Temp"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: gtk-gui.c:601
+#: gtk-gui.c:643
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: gtk-gui.c:927
+#: gtk-gui.c:1381
 msgid "Three"
 msgstr "Alla"
 
-#: main.c:37
+#: main.c:62
 msgid "Thu"
 msgstr "tor"
 
-#: info.c:822 print.c:155
+#: info.c:1016 print.c:510
 msgid "Time"
 msgstr "Tid"
 
-#: gtk-gui.c:933
+#: gtk-gui.c:1497
+msgid ""
+"To edit dive information\n"
+"double click on it in the dive list"
+msgstr ""
+
+#: gtk-gui.c:1391
 msgid "Toggle Zoom"
 msgstr "Zoom av/på"
 
-#: statistics.c:164
+#: statistics.c:186
 msgctxt "Duration"
 msgid "Total"
 msgstr "Total"
 
-#: statistics.c:681
+#: statistics.c:788
 msgid "Total Time"
 msgstr "Total tid"
 
+#: print.c:336
+#, fuzzy, c-format
+msgid "Total Weight:"
+msgstr "Vikt:"
+
+#: planner.c:502
+#, c-format
+msgid "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s\n"
+msgstr ""
+
 #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives
-#: divelist.c:376
+#: divelist.c:268
 #, c-format
 msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)"
 msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)"
 msgstr[0] "Resa %1$s, %3$d %2$s, %4$d (%5$d dyk)"
 msgstr[1] "Resa %1$s, %3$d %2$s, %4$d (%5$d dyk)"
 
-#: main.c:37
+#: main.c:62
 msgid "Tue"
 msgstr "tis"
 
-#: equipment.c:1493 equipment.c:1521
+#: equipment.c:1452 equipment.c:1480
 msgid "Type"
 msgstr "Typ"
 
 #: uemis-downloader.c:28
+#, fuzzy
 msgid ""
 "Uemis Zurich: File System is almost full\n"
 "Disconnect/reconnect the dive computer\n"
-"and try again"
+"and click 'Retry'"
 msgstr ""
 "Uemis Zurich: Filsystem är nästan fullt\n"
 "Återanslut dykdatorn och försök\n"
@@ -996,69 +1544,98 @@ msgstr ""
 "Återanslut dykdatorn och försök\n"
 "igen"
 
-#: uemis-downloader.c:559
+#: uemis-downloader.c:763
 msgid "Uemis init failed"
 msgstr "Kunde inte läsa från Uemis"
 
-#: libdivecomputer.c:390
+#: libdivecomputer.c:698
 msgid "Unable to create libdivecomputer context"
 msgstr ""
 
-#: libdivecomputer.c:225
+#: libdivecomputer.c:403
 #, c-format
 msgid "Unable to create parser for %s %s"
 msgstr ""
 
-#: libdivecomputer.c:392
+#: libdivecomputer.c:700
 #, fuzzy, c-format
 msgid "Unable to open %s %s (%s)"
 msgstr "Kunde inte öppna %i filer."
 
-#: gtk-gui.c:579
+#: gtk-gui.c:622
 msgid "Units"
 msgstr "Enheter"
 
-#: gtk-gui.c:906
+#: webservice.c:227
+msgid "User Identifier"
+msgstr ""
+
+#: gtk-gui.c:1355
 msgid "View"
 msgstr "Visa"
 
-#: gtk-gui.c:596
+#: info.c:711 statistics.c:837
+msgid "Visibility"
+msgstr ""
+
+#: gtk-gui.c:638
 msgid "Volume:"
 msgstr "Volym:"
 
-#: statistics.c:730
+#: info.c:629
+msgid "W"
+msgstr ""
+
+#: statistics.c:843
 msgid "Water Temp"
 msgstr "Vattentemperatur"
 
-#: main.c:37
+#: webservice.c:255
+msgid "Webservice"
+msgstr ""
+
+#: main.c:62
 msgid "Wed"
 msgstr "ons"
 
-#: equipment.c:1020 equipment.c:1620 gtk-gui.c:642
+#: equipment.c:985 equipment.c:1579 gtk-gui.c:679
 msgid "Weight"
 msgstr "Vikt"
 
-#: equipment.c:1125
+#: equipment.c:1084 print.c:304
+#, c-format
 msgid "Weight System"
 msgstr "Viktsystem"
 
-#: gtk-gui.c:606
+#: gtk-gui.c:648
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: gtk-gui.c:153
+#: gtk-gui.c:123
 msgid "XML file"
 msgstr "XML-fil"
 
-#: statistics.c:160
+#: statistics.c:182
 msgid "Year"
 msgstr ""
 
-#: gtk-gui.c:920 statistics.c:368
+#: gtk-gui.c:1371 statistics.c:390
 msgid "Yearly Statistics"
 msgstr "Årsstatistik"
 
-#: gtk-gui.c:238
+#: gtk-gui.c:1985
+#, c-format
+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)."
+msgstr ""
+
+#: gtk-gui.c:208
 msgid ""
 "You have unsaved changes\n"
 "Would you like to save those before closing the datafile?"
@@ -1066,7 +1643,7 @@ msgstr ""
 "Du har ändringer som inte är sparade.\n"
 "Vill du spara dem innan du stänger datafilen?"
 
-#: gtk-gui.c:241 gtk-gui.c:244
+#: gtk-gui.c:211 gtk-gui.c:214
 #, c-format
 msgid ""
 "You have unsaved changes to file: %s \n"
@@ -1075,195 +1652,314 @@ msgstr ""
 "Du har ändringer som inte är sparade i %s.\n"
 "Vill du spara dem innan du stänger datafilen?"
 
-#: divelist.c:639
-#, fuzzy
+#: divelist.c:544 planner.c:74 planner.c:725 print.c:183 profile.c:399
+#, fuzzy, c-format
 msgid "air"
 msgstr "bar"
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "airtime"
 msgstr ""
 
-#: equipment.c:832
+#: equipment.c:828
 msgid "ankle"
 msgstr "ankel"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ascent"
 msgstr ""
 
-#: equipment.c:833
+#: equipment.c:829
 msgid "backplate weight"
 msgstr ""
 
-#: dive.c:45
+#: dive.c:46
 msgid "bar"
 msgstr "bar"
 
-#: equipment.c:831
+#: equipment.c:827
 msgid "belt"
 msgstr "bälte"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "bookmark"
 msgstr ""
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "ceiling"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:152
 msgid "ceiling (safety stop)"
 msgstr ""
 
-#: equipment.c:834
+#: equipment.c:830
 msgid "clip-on"
 msgstr "clip-on"
 
-#: dive.c:88
+#: dive.c:91 planner.c:890
 msgid "cuft"
 msgstr ""
 
-#: libdivecomputer.c:80
-msgid "deco"
+#: uemis-downloader.c:384
+msgid "data"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: libdivecomputer.c:149
+msgid "deco stop"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "deepstop"
 msgstr ""
 
-#: libdivecomputer.c:83
+#: uemis-downloader.c:405
+msgid "divelog entry id"
+msgstr ""
+
+#: uemis-downloader.c:407
+msgid "divespot data id"
+msgstr ""
+
+#: libdivecomputer.c:152
 msgid "divetime"
 msgstr ""
 
-#: dive.c:113 divelist.c:1264 info.c:867
+#: uemis-downloader.c:589
+msgid "drysuit"
+msgstr ""
+
+#: planner.c:727
+#, fuzzy
+msgid "ean"
+msgstr "jan"
+
+#: statistics.c:678
+#, c-format
+msgid "for all dives"
+msgstr ""
+
+#: statistics.c:674
+#, fuzzy, c-format
+msgid "for dive #%d"
+msgstr "Dyk #%d - "
+
+#: statistics.c:633
+#, c-format
+msgid "for dives #"
+msgstr ""
+
+#: statistics.c:676
+#, fuzzy, c-format
+msgid "for selected dive"
+msgstr "Skriv ut valda dyk"
+
+#: statistics.c:640
+#, fuzzy, c-format
+msgid "for selected dives"
+msgstr "Skriv ut valda dyk"
+
+#: dive.c:117 divelist.c:1418 info.c:1078 planner.c:831
 msgid "ft"
 msgstr "ft"
 
-#: libdivecomputer.c:82
+#: uemis-downloader.c:590
+msgid "full suit"
+msgstr ""
+
+#: libdivecomputer.c:151 libdivecomputer.c:154
 msgid "gaschange"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "heading"
 msgstr ""
 
-#: equipment.c:830
+#: equipment.c:826
 msgid "integrated"
 msgstr "integrerat"
 
-#: libdivecomputer.c:103
+#: libdivecomputer.c:171
 msgid "invalid event number"
 msgstr ""
 
-#: dive.c:136 equipment.c:1045 gtk-gui.c:607
+#: uemis-downloader.c:590
+msgid "jacket"
+msgstr ""
+
+#: dive.c:141 equipment.c:1004 gtk-gui.c:649
 msgid "kg"
 msgstr "kg"
 
-#: dive.c:83
+#: dive.c:86
 msgid "l"
 msgstr ""
 
-#: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608
+#: dive.c:137 divelist.c:1421 equipment.c:1006 gtk-gui.c:650
 msgid "lbs"
 msgstr "pund"
 
-#: dive.c:108 info.c:867
+#: uemis-downloader.c:590
+msgid "long john"
+msgstr ""
+
+#: dive.c:112 info.c:1078
 msgid "m"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: gtk-gui.c:800
+msgid "max ppO2"
+msgstr ""
+
+#: divelist.c:1427 gtk-gui.c:727
+msgid "maxCNS"
+msgstr ""
+
+#: libdivecomputer.c:153
 #, fuzzy
 msgid "maxdepth"
 msgstr "Maxdjup"
 
-#: divelist.c:1265
+#: uemis-downloader.c:591
+msgid "membrane"
+msgstr ""
+
+#: divelist.c:1419 planner.c:896
 msgid "min"
 msgstr "Min"
 
-#: libdivecomputer.c:333
+#: libdivecomputer.c:629
 #, c-format
 msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)"
 msgstr ""
 
-#: statistics.c:501
+#: uemis-downloader.c:409
+#, fuzzy
+msgid "more data dive id"
+msgstr "mer än %d dagar"
+
+#: statistics.c:522
 #, c-format
 msgid "more than %d days"
 msgstr "mer än %d dagar"
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:154
+msgid "non stop time"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "none"
 msgstr ""
 
-#: dive.c:41
+#: gtk-gui.c:783
+msgid "pHe threshold"
+msgstr ""
+
+#: gtk-gui.c:765
+#, c-format
+msgid "pN%s threshold"
+msgstr ""
+
+#: gtk-gui.c:746
+#, c-format
+msgid "pO%s threshold"
+msgstr ""
+
+#: dive.c:42
 msgid "pascal"
 msgstr ""
 
-#: dive.c:49
+#: dive.c:50
 msgid "psi"
 msgstr ""
 
-#: libdivecomputer.c:80
+#: libdivecomputer.c:149
 msgid "rbt"
 msgstr ""
 
-#: libdivecomputer.c:84
+#: libdivecomputer.c:153
 msgid "rgbm"
 msgstr ""
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "safety stop"
 msgstr ""
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (mandatory)"
 msgstr ""
 
-#: libdivecomputer.c:82
+#: libdivecomputer.c:151
 msgid "safety stop (voluntary)"
 msgstr ""
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:589
+msgid "semidry"
+msgstr ""
+
+#: uemis-downloader.c:590
+msgid "shorty"
+msgstr ""
+
+#: libdivecomputer.c:150
 msgid "surface"
 msgstr ""
 
-#: libdivecomputer.c:85
+#: libdivecomputer.c:154
 msgid "tissue level warning"
 msgstr ""
 
 #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here
-#: gtk-gui.c:859
+#: gtk-gui.c:1062
 msgid "translator-credits"
 msgstr "Linus Torvalds"
 
-#: libdivecomputer.c:81
+#: libdivecomputer.c:150
 msgid "transmitter"
 msgstr ""
 
-#: equipment.c:1386 equipment.c:1406
+#: equipment.c:1345 equipment.c:1365
 msgid "unkn"
 msgstr "okänd"
 
-#: libdivecomputer.c:83 statistics.c:541
+#: libdivecomputer.c:152 print.c:317 statistics.c:563 statistics.c:584
+#: uemis-downloader.c:133
 msgid "unknown"
 msgstr "okänd"
 
-#: equipment.c:544
+#: equipment.c:540
 msgid "unspecified"
 msgstr "inte specifierad"
 
-#: libdivecomputer.c:81
+#: uemis-downloader.c:590
+msgid "vest"
+msgstr ""
+
+#: libdivecomputer.c:150
 #, fuzzy
 msgid "violation"
 msgstr "Plats"
 
-#: equipment.c:1522
+#: equipment.c:1481
 msgid "weight"
 msgstr "Vikt"
 
-#: libdivecomputer.c:80
+#: uemis-downloader.c:589
+msgid "wetsuit"
+msgstr ""
+
+#: libdivecomputer.c:149
 msgid "workload"
 msgstr ""
 
 #~ msgid "About"
 #~ msgstr "Om"
+
+#~ msgid "Automatically group dives in trips"
+#~ msgstr "Gruppera dyk som resor automatisk"
+
+#~ msgid "Delete"
+#~ msgstr "Radera"
+
+#~ msgid "Pretty print"
+#~ msgstr "Prydlig utskrift"
author	Dirk Hohndel <dirk@hohndel.org>	2013-02-01 18:08:13 +1100
committer	Dirk Hohndel <dirk@hohndel.org>	2013-02-01 18:08:13 +1100
commit	08d4b43243a28e930447bbd15780438ab814b866 (patch)
tree	9d0cc94ab39a3cc2f53f13cd0c21dceef5916eee /po
parent	29e73be9f2958c8ae3c4eb9efe6d602e89e2c6ae (diff)
download	subsurface-08d4b43243a28e930447bbd15780438ab814b866.tar.gz